am 5aaf5c28: am 282bd952: am 9dacf7ee: Merge "Fix two incorrect <android/input.h> function declarations."

* commit '5aaf5c288c34853725a3bed4d369d25108073101':
  Fix two incorrect <android/input.h> function declarations.