am 254a7090: am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98

* commit '254a709075bc78250b28d8dc34e859821d6499b6':
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file