Merge "Remove LOCAL_MODULE_TAGS" am: 8dfa285e28 am: f354848fbc
am: ab25a77b5b

Change-Id: Iac8922f47cf89c0caf35a6a42aec170f0e044a9f