am bb630cec: (-s ours) Refactor AndroidKeymaster so all methods use message objects.

* commit 'bb630cec2c184bfd43a55bf8ce0399aa6dfbd99f':
  Refactor AndroidKeymaster so all methods use message objects.