Android CTS 5.1 Release 15 (3619395)
Merge "host modules don't need LOCAL_MODULE_TAGS"