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

Change-Id: Iad9a656dfe0e109483bca4028eeb415f4540a2f5