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

Change-Id: I0298b237f67c860aa19be20aea4c820cda5520d0