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