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

* commit '2121219cfd5cc288d6ad1f42d5d37d62e476c7b0':
  Bring back ADB_EXTERNAL_STORAGE.