Android CTS 6.0 Release 32 (4959172)
Merge "host modules don't need LOCAL_MODULE_TAGS"