Merge "Removing a temporary redirect for /ndk/guides/cmake.html am: dafcbfa693" into nyc-dev-plus-aosp am: 8139010d37
am: d5519c6a1a

Change-Id: I0af1a1a3f46728d3def48b07a7b10f8557211d1f