am 060e9b04: Make keymaster_defs.h compatible with v0.3 keymaster.h.

* commit '060e9b04445f91db31b2b412f944aa402b9e1a8d':
  Make keymaster_defs.h compatible with v0.3 keymaster.h.