Android CTS 6.0 Release 31 (4890202)
Merge "host modules don't need LOCAL_MODULE_TAGS"