Merge "Reland "File.getCanonicalPath() should remove parent directory /.. at the rootfs"" into main