Android CTS 5.1 Release 20 (3993894)
Merge "host modules don't need LOCAL_MODULE_TAGS"