Merge "Fix adb install" into jb-mr1-dev