Android CTS 6.0 release 2
Merge "host modules don't need LOCAL_MODULE_TAGS"