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