am 834d4130: Move soft_keymaster headers to include/keymaster

* commit '834d4130bab134a83b52bc66e25c3a57b202e0e2':
  Move soft_keymaster headers to include/keymaster