Merge "Bring back ADB_EXTERNAL_STORAGE." into jb-mr1-dev