Android CTS 6.0 Release 7 (2906653)
Merge "host modules don't need LOCAL_MODULE_TAGS"