Android 6.0.1 release 42 (MOB30I)
Merge "host modules don't need LOCAL_MODULE_TAGS"