am adbdefb0: Replace shared storage with USB storage.

Merge commit 'adbdefb086b5393cd710ffdcc4e63c34bc81ea41' into gingerbread-plus-aosp

* commit 'adbdefb086b5393cd710ffdcc4e63c34bc81ea41':
  Replace shared storage with USB storage.