Merge "Use <stdint.h> in jni.h for better x86_64 portability."