Android CTS 6.0 Release 16 (3736419)
Merge "host modules don't need LOCAL_MODULE_TAGS"