Android CTS 6.0 Release 30 (4844167)
Merge "host modules don't need LOCAL_MODULE_TAGS"