Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master
am: b7162b936f

Change-Id: I08acc7cc88ab36aacd76e8460ac521bd33eaa4d9