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

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