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

* commit 'eddb9c891619c39f459d10b200eddb1f2932c96b':
  Rename API AndroidKey* -> Key*