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

Change-Id: I6b85fff1859b5b5c0676c822e51f9a28d8a417b3