Merge "Remove unused `tags` property from Android.bp files"