Merge "Remove unused `tags` property from Android.bp files"
am: 22d8aad2b4

Change-Id: I209f244747380e0d64a631f54a92f53819100bda