[automerger skipped] Merge "Use filegroup to simplify Android.bp for...

[automerger skipped] Merge "Use filegroup to simplify Android.bp for frameworks and its friends" am: d047e522 -s ours am: 6ca536a7 -s ours am: 3fe8d619 -s ours am: 66622019 -s ours
am: 040eb4fc -s ours
am skip reason: change_id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA1 7e1339e0 is in history

Change-Id: If4173c03998949ddb1d45d1ad80dbe89b03f772c