Android CTS 6.0 Release 17 (3866870)
Merge "host modules don't need LOCAL_MODULE_TAGS"