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

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