Merge "Remove Brillo-specific LOCAL_MODULE_TAGS" am: 11708e0236 am: 5c72c9688f
am: f8e59569e2

Change-Id: I346733f7277ade2001c562ee1d37e3a96ba22a4a