Merge "NDK: x86 header file has incorrect definition for ptrdiff_t"