Merge "Migrate sdcard0 to shell-accessible location." into jb-mr1-dev