am b29e27a9: Final shuffle to make /sdcard work in shell.

* commit 'b29e27a9efdcd33ad081c093838a63b7fba099bd':
  Final shuffle to make /sdcard work in shell.