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

Change-Id: I5cf2014af986c93eedb8fc80792d8dde968bf1f6