am 36d41e23: Refactor AndroidKeymaster so all methods use message objects.

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