[automerger skipped] Merge "Use filegroup to simplify Android.bp for frameworks and its friends"
am:d047e52296-s ours am skip reason: change_id I0705ddf76b3c628127f65d75e0a8b06c6c250fe2 with SHA17e1339e055is in history Change-Id: Idee6fdc4b99292f894b04421fbeb17f48208d9f8
This commit is contained in: