Merge "Convert more of frameworks/base/packages to Android.bp" into stage-aosp-master am: ba9073a6a8 am: 97c07ce018 am: 7d089ac5ae
am: aa98bac24b

Change-Id: Iefbb6eeb03d46753bfc1c2ac4ca793788a4ed7fa