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

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