Merge "Clean up warnings in inputflinger."
am: f3606ef25f

* commit 'f3606ef25fb588283020c4df178076852eecc4e3':
  Clean up warnings in inputflinger.