Android 6.0.0 release 12
Merge "host modules don't need LOCAL_MODULE_TAGS"