Android CTS 6.0 Release 9 (3102289)
Merge "host modules don't need LOCAL_MODULE_TAGS"