Merge "Remove unused `tags` property from Android.bp files"
am: 9835d2ca30

Change-Id: I59ec9ce313aefa33fcf2e4295351eea36a4854c3