Android CTS 6.0 Release 29 (4814787)
Merge "host modules don't need LOCAL_MODULE_TAGS"