Android CTS 5.1 Release 17 (3736405)
Merge "host modules don't need LOCAL_MODULE_TAGS"