Update for NDK 10.2 Gold