Merge "Remove unused `tags` property from Android.bp files" into pi-dev-plus-aosp
am: 1790fca30c

Change-Id: I88c1dcc41c710540d1e13f5b1a81392cc4a9866d