Android CTS 6.0 Release 18 (3942491)
Merge "host modules don't need LOCAL_MODULE_TAGS"