Merge "Switch sdcardfs over to bind mounts."