[automerger skipped] Merge "Convert more of frameworks/base/packages to Android.bp"
am:25fff4828a-s ours am skip reason: change_id I851b819030a1da6091f5d6125a228bb01a99011b with SHA120bc2bf3f6is in history Change-Id: Id32923bd0cc23787a4ca841ddfc7e6bc96351548
This commit is contained in: