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

Change-Id: I6f5d32921e7954858cdf27467fca5079d267e5a0