am 2acd43d3: Replace shared storage with USB storage.

Merge commit '2acd43d31cf5ffdda9b4e72a303c1db7205af613' into gingerbread-plus-aosp

* commit '2acd43d31cf5ffdda9b4e72a303c1db7205af613':
  Replace shared storage with USB storage.