Android CTS 6.0 Release 12 (3417974)
Merge "host modules don't need LOCAL_MODULE_TAGS"