Merge "Remove unused `tags` property from Android.bp files"
am: 9415ec2a4f

Change-Id: If5c653b9e8e07becbfd9418b9ba48440088dd31d