Merge changes Ibee74a22,Ifef4dc98

* changes:
  NDK: x86 header file has incorrect definition for ptrdiff_t
  Fix size_t definition in x86 NDK header file