Android CTS 5.1 Release 18 (3824209)
Merge "host modules don't need LOCAL_MODULE_TAGS"