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

Change-Id: Ied825bc0503ff678200d9b117739c8dd5dc27ebe