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

Change-Id: Ib440e45e49b5c29120b57a4d28cb2760446a66d0