Merge "Convert more of frameworks/base/packages to Android.bp" into stage-aosp-master am: ba9073a6 am: 97c07ce0 am: 7d089ac5 Change-Id: I31ec5ab872c44bd6652abe42328aecb9c3e65eb5