Merge "Remove unused `tags` property from Android.bp files" am: 0515943d7d
am: 2be702c71a

Change-Id: I0bbc69087c1ab1d01013b08fcc9423a510f4e130