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

Change-Id: I41532bcc42aab1f0ae81509ac30203ca1d8afa1a