[automerger skipped] Merge "Use filegroup to simplify Android.bp for frameworks and its friends" into stage-aosp-master am: b7162b936f am: 5db24005a6 am: 28bde2ffbb
am: 59928ac0fb -s ours
am skip reason: change_id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA1 b360931bf0 is in history

Change-Id: I0562e78a94c04f9e6a99e5c0ff72815ccd951b96