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

Change-Id: I95be97ba7a87d9dbe46889a18e32b3dd949a54a1