am 33aacf19: Introduce "adb keygen" automerge: 86c9e5f

* commit '33aacf1963dd1914c0ff94c4ddd05f729cdba3b6':
  Introduce "adb keygen"