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

Change-Id: Ib2367374818a66cb257ab772204dc1be79e47242