Android CTS 6.0 Release 22 (4267323)
Merge "host modules don't need LOCAL_MODULE_TAGS"