Android CTS 6.0 Release 13 (3530687)
Merge "host modules don't need LOCAL_MODULE_TAGS"