Merge "uncrypt: remove --read-bcb option." am: ebd22be am: ecc068c  -s ours
am: f41c35d

* commit 'f41c35d774de88bc668c94ee5cfa43b60eb6eea1':
  uncrypt: remove --read-bcb option.

Change-Id: I05dfeef0be5d80d717c37a9fc03b1c61cb3e5e6b