Merge "Remove Brillo-specific LOCAL_MODULE_TAGS"
am: 11708e0236

Change-Id: I36fe7de8fc5c4bc911c5860b33aef201adde0ed9