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

* commit 'c57fd963817afa8894af49d6c98a80d8f9100937':
  NDK: x86 header file has incorrect definition for ptrdiff_t