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

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