am a74541f3: (-s ours) Reconcile with jb-mr1-release - do not merge

* commit 'a74541f3ad7904334ebe97294b05dba23f00cd9b':
  Bring back ADB_EXTERNAL_STORAGE.