DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb
am: 9606ea8a43  -s ours

* commit '9606ea8a4306ac2be9b3d9c17ad7dc890cf25170':
  DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)

Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc