am f1af4fb4: am adbdefb0: Replace shared storage with USB storage.

Merge commit 'f1af4fb48112ee9b749f0a27b8baaa52c2632ef5'

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