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

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