Android m preview
Merge "host modules don't need LOCAL_MODULE_TAGS"