Android CTS 6.0 Release 24 (4400446)
Merge "host modules don't need LOCAL_MODULE_TAGS"