Merge "Removing a temporary redirect for /ndk/guides/cmake.html" into nyc-dev am: 8b05feb5b4
am: ba9db4b110

Change-Id: I3201bc9d32830160df518f86fd8e2dd1a82c0694