Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9' * commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9': Fix some API discrepancies in InputEvent.
Merge commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9' * commit 'e740dd0c8fde910066f9ddf83b4ab094ed95eaf9': Fix some API discrepancies in InputEvent.