Android CTS 5.1 release 2
Merge "host modules don't need LOCAL_MODULE_TAGS"