Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693 am: aff6881d04 am: 2eb458b8cd am: 854d5bf75b" into nyc-mr1-dev-plus-aosp
am: 4d3bd53d56

Change-Id: Iecdcda5b44be430bc5453d9ff19478ffc4153ece