Android CTS 6.0 Release 23 (4337277)
Merge "host modules don't need LOCAL_MODULE_TAGS"