Android CTS 4.4 release 4
Merge "host modules don't need LOCAL_MODULE_TAGS"