Android CTS 6.0 Release 4
Merge "host modules don't need LOCAL_MODULE_TAGS"