Android CTS 6.0 Release 25 (4485418)
Merge "host modules don't need LOCAL_MODULE_TAGS"