Android CTS 5.1 Release 9 (3046116)
Merge "host modules don't need LOCAL_MODULE_TAGS"