Merge "DO NOT MERGE - Add verifiedboot keys to otatools.zip (this is needed for Shamu) am: 74da4d6eef am: cea440c2eb am: 9606ea8a43  -s ours am: 3c42a21466 am: 4c8e743fa5" into nyc-mr1-dev-plus-aosp