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

* commit '9f02737df73cc773e5b1cf62939b2752a6eb9a19':
  Bring back ADB_EXTERNAL_STORAGE.