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

Change-Id: Ie8041bd2cdb4f9cf467c184af97f1b1591b972b4