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

Change-Id: Iaf77bf7fde68cef40d913558b190aae63db66c44