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

* commit 'bb2cba56b9b64f8bc5ed2bfb68e4836d22862200':
  Add encryption parameters to adb install