Merge "Remove unused `tags` property from Android.bp files" am: 22d8aad2b4
am: bcd68ce421

Change-Id: I386d2ebc041d6718294774c47f5e4ba06b45166d