Merge "Add encryption parameters to adb install" into jb-dev