Android CTS 5.1 Release 23 (4259358)
Merge "host modules don't need LOCAL_MODULE_TAGS"