Android CTS 6.0 Release 21 (4214424)
Merge "host modules don't need LOCAL_MODULE_TAGS"