am 78017d2e: am eddb9c89: Merge "Rename API AndroidKey* -> Key*" into jb-mr2-dev

* commit '78017d2e0fc81d1b07b26b358fe24b9af1d7d490':
  Rename API AndroidKey* -> Key*