Merge "Don't bind-mount bionic files"