Android CTS 6.0 Release 20 (4120755)
Merge "host modules don't need LOCAL_MODULE_TAGS"