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

Change-Id: Ice83a5ccf269f685f5ac1189d041c0f3b4a7a496