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

Change-Id: I515c0c0b6870f8eafd850011cf8c9799fdd72a90