am 0f97bab8: Merge changes Ibee74a22,Ifef4dc98

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