am d8a8979b: Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev

* commit 'd8a8979bd932a73378286ecea6a03c7fa8e1b2a6':
  Bring back ADB_EXTERNAL_STORAGE.