Merge "Revert "Fix canonicalizing /sdcard""