Android 6.0.1 release 3
Merge "host modules don't need LOCAL_MODULE_TAGS"