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

Change-Id: I090d973fc9c4cfeb10eca5f475095ccbfcd49ef3