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

Change-Id: Ic9a267229a0fd245c3c8787e10462e64eef036a5