Android N IOT Preview 4 (NIH40E)
Merge "C/C++ adjustments and bug fixes."