Android CTS 5.1 Release 24 (4340933)
Merge "host modules don't need LOCAL_MODULE_TAGS"