Android CTS 5.1 Release 13 (3414425)
Merge "host modules don't need LOCAL_MODULE_TAGS"