Android CTS 5.1 Release 19 (3942390)
Merge "host modules don't need LOCAL_MODULE_TAGS"