Merge "Fix two incorrect <android/input.h> function declarations."