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