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

Change-Id: Idd3d6551802084b500bb8101def34d29386ccc3a