[automerger skipped] Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b93 am: 5db24005 am: 28bde2ff
am: 59928ac0 -s ours
am skip reason: change_id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA1 b360931b is in history

Change-Id: I0562e78a94c04f9e6a99e5c0ff72815ccd951b96