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

* commit '82d47db4815ab8b49f4c399ba16d2af12926cfe1':
  Clean up warnings in inputflinger.