Merge changes from Android/CMake upstream repo to support NDK r10d.