Android CTS 5.1 Release 22 (4181931)
Merge "host modules don't need LOCAL_MODULE_TAGS"