DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for...
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6e am: cea440c2
am: 9606ea8a -s ours
* commit '9606ea8a':
DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu)
Change-Id: Ia925f396973716d5fcd3120a74b0c44ad99a99fc