Merge "Allow zygote to access dir/file under /vendor/overlay" into oc-dev