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

Change-Id: I20a3c59fcee2bee8e716bea52a964a3bd987a60e