Merge "Fix canonicalizing /sdcard"