Merge "Use an older standard for the NDK gtest libs."