am b2c8dbea: am 5ac5e8d7: Merge "ndk: Fix stdint.h definitions for C++"

* commit 'b2c8dbeafb93d87ce877529c508c1911d6a9fcf6':
  ndk: Fix stdint.h definitions for C++