Merge "Add jni_headers to libinput_evdev" am: 93b6bed67a am: 76f174cfe4

Change-Id: I022224e6e2652ba10e3a849de3836e107c7adb13