docs: Reverting SDK r21.0.1 and NDK r8d Release Notes due to release conflict

Revert of CL change-id: Ieefa651cb8f1d01170a915fe956a97fd6a52e696
Revert of CL change-id: Ifaaa6579df6cb180f515f2a5e71b2ac62a1671c3

Change-Id: I315da053238943a7f77cc30564904bbf0cefed62

3 files changed, 10 insertions, 395 deletions

diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd
index 243683c..f2ff07c 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -57,125 +57,6 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues
 <div class="toggle-content opened">
   <p><a href="#" onclick="return toggleContent(this)">
     <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>ADT 21.0.1</a> <em>(December 2012)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-<dl>
-  <dt>Dependencies:</dt>
-
-  <dd>
-    <ul>
-      <li>Java 1.6 or higher is required for ADT 21.0.1.</li>
-      <li>Eclipse Helios (Version 3.6.2) or higher is required for ADT 21.0.1.</li>
-      <li>ADT 21.0.1 is designed for use with <a href="{@docRoot}tools/sdk/tools-notes.html">SDK
-      Tools r21.0.1</a>. If you haven't already installed SDK Tools r21.0.1 into your SDK, use the
-      Android SDK Manager to do so.</li>
-    </ul>
-  </dd>
-
-  <dt>General Notes:</dt>
-  <dd>
-    <ul>
-      <li>Build
-        <ul>
-          <li>Updated build to detect and handle package name conflicts between an application and
-            the libraries it depends on. Libraries cannot share package names unless all of them
-            share the same package name.
-            (<a href="http://code.google.com/p/android/issues/detail?id=40152">Issue 40152</a>,
-             <a href="http://code.google.com/p/android/issues/detail?id=40273">Issue 40273</a>)
-          </li>
-          <li>Added a flag to disable dex merging to deal with cases where merging could generate
-            a broken dex file. If this happens to your project, add the following setting to your
-            {@code project.properties} file: {@code dex.disable.merger=true} This setting
-            causes the build system to revert to the older, slower dex processing that does not
-            pre-dex libraries.</li>
-        </ul>
-      </li>
-    </ul>
-  </dd>
-
-  <dt>Bug fixes:</dt>
-  <dd>
-    <ul>
-      <li>Lint
-        <ul>
-          <li>Corrected check for {@code 0px} values in style XML elements.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39601">Issue 39601</a>)
-            </li>
-          <li>Fixed incorrect flagging of formatting strings.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39758">Issue 39758</a>)
-            </li>
-          <li>Fixed problem where {@code tools:ignore} directive in the manifest file was ignored
-            by the Lint tool.
-            (<a href="http://code.google.com/p/android/issues/detail?id=40136">Issue 40136</a>)
-            </li>
-          <li>Fixed problem with flagging a wakelock release inside a conditional.
-            (<a href="http://code.google.com/p/android/issues/detail?id=40424">Issue 40424</a>)
-            </li>
-          <li>Fixed incorrect reporting of missing {@code layout_width} and {@code layout_height}
-            XML fields.
-            (<a href="http://code.google.com/p/android/issues/detail?id=38958">Issue 38958</a>)
-            </li>
-          <li>Fixed handling of custom namespace attributes.</li>
-          <li>Added fixes for filtering out library project warnings.</li>
-          <li>Removed warnings about missing classes before a build.</li>
-        </ul>
-      </li>
-
-      <li>Android Virtual Device Manager
-        <ul>
-          <li>Fixed handling of {@code devices.xml} file in other locales.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39704">Issue 39704</a>)
-            </li>
-          <li>Fixed problem where the AVD Manager would not allow you to create a new AVD using
-            the <strong>4.0" WVGA</strong> or <strong> 4.65" 720p</strong> device definitions.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39939">Issue 39939</a>)
-            </li>
-          <li>Fixed problem where deleted device definitions were not removed.</li>
-          <li>Fixed incorrect screen resolution setting for the Nexus One device definition.</li>
-          <li>Fixed problem where writing of an AVD settings file does not properly escape
-            {@code \\} path characters.</li>
-        </ul>
-      </li>
-
-      <li>Layout Editor
-        <ul>
-          <li>Fixed problem where layout cannot render strings starting with {@code \@}.
-            (<a href="http://code.google.com/p/android/issues/detail?id=40222">Issue 40222</a>)
-            </li>
-          <li>Fixed preview error when using the {@code android:numColumns} attribute in a layout.
-            (<a href="http://code.google.com/p/android/issues/detail?id=21296">Issue 21296</a>)
-            </li>
-          <li>Fixed compatibility issue with IntelliJ layout preview caused by layout editor
-            deleting the {@code .android/devices.xml} file.</li>
-          <li>Added fixes to editor for {@link android.widget.GridLayout}.</li>
-        </ul>
-      </li>
-
-      <li>Added support for {@code ldrtl} and {@code ldltr} resource qualifiers.</li>
-      <li>Fixed problem where Android XML resources mistakenly get compiled into {@code *.out.xml}
-        output files, causing project errors.
-        (<a href="http://code.google.com/p/android/issues/detail?id=3767">Issue 3767</a>)</li>
-      <li>Fixed error which caused resource refresh operations to fail.
-        (<a href="http://code.google.com/p/android/issues/detail?id=39213">Issue 39213</a>)</li>
-      <li>Updated the Custom View code template handle to library projects properly.</li>
-      <li>Fixed support for library string resources ({@code strings.xml}) when exporting an
-        application that references a library with string resources.
-        (<a href="http://code.google.com/p/android/issues/detail?id=39751">Issue 39751</a>)</li>
-      <li>Fixed problem where bad AVD setting files caused Device Manager and graphical XML editors
-        to crash.
-        (<a href="http://code.google.com/p/android/issues/detail?id=40400">Issue 40400</a>)</li>
-    </ul>
-  </dd>
-
-</dl>
-</div>
-</div>
-
-<div class="toggle-content closed">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
       alt=""/>ADT 21.0.0</a> <em>(November 2012)</em>
   </p>
 
diff --git a/docs/html/tools/sdk/ndk/index.jd b/docs/html/tools/sdk/ndk/index.jd
index f3c9a44..ad4fd7c 100644
--- a/docs/html/tools/sdk/ndk/index.jd
+++ b/docs/html/tools/sdk/ndk/index.jd
@@ -1,18 +1,19 @@
 ndk=true
 
-ndk.win_download=android-ndk-r8d-windows.zip
-ndk.win_bytes=327014028
-ndk.win_checksum=d78ec3d4ec15ad3b18b9f488a5763c23
+ndk.win_download=android-ndk-r8c-windows.zip
+ndk.win_bytes=233787657
+ndk.win_checksum=3ff1570fa4ea865b7702507ea43dbae4
 
-ndk.mac_download=android-ndk-r8d-darwin-x86.tar.bz2
-ndk.mac_bytes=308328942
-ndk.mac_checksum=5cd9ef9fb7e03943ee8c9e147e42e571
+ndk.mac_download=android-ndk-r8c-darwin-x86.tar.bz2
+ndk.mac_bytes=214270840
+ndk.mac_checksum=74a23e9e058512121835e0d6932e72d5
 
-ndk.linux_download=android-ndk-r8d-linux-x86.tar.bz2
-ndk.linux_bytes=254644383
-ndk.linux_checksum=e1fa0379a3feb59f2f0865f1a90bd382
+ndk.linux_download=android-ndk-r8c-linux-x86.tar.bz2
+ndk.linux_bytes=179945337
+ndk.linux_checksum=b0851346ff90c9266bc050016a228319
 
 page.title=Android NDK
+
 @jd:body
 
 
@@ -249,170 +250,6 @@ the NDK, as denoted by revision number. </p>
 <div class="toggle-content opened">
   <p><a href="#" onclick="return toggleContent(this)">
     <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt="">Android NDK, Revision 8d</a> <em>(December 2012)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-    <dl>
-      <dt>Important changes:</dt>
-      <dd>
-        <ul>
-          <li>Added the GNU Compiler Collection (GCC) 4.7 compiler to the NDK. The GCC 4.6 compiler
-            is still the default, so you must to explicitly enable the new version as follows:
-            <ul>
-              <li>For {@code ndk-build}, export the {@code NDK_TOOLCHAIN_VERSION=4.7} variable
-                <em>or</em> add it to {@code Application.mk}.</li>
-              <li>For standalone builds, add the {@code --toolchain=} option to
-                {@code make-standalone-toolchain.sh}, for example:
-                <pre>--toolchain=arm-linux-androideabi-4.7</pre></li>
-            </ul>
-            <p class="note">
-              <strong>Note:</strong> This feature is experimental. Please try it and
-              <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p>
-          </li>
-          <li>Added {@code stlport} exception support via gabi++.  Note that the new gabi++
-            depends on {@code dlopen} and related code, meaning that:
-            <ul>
-              <li>You can no longer build a <em>static</em> executable using the {@code -static}
-                option or include {@code libstlport_static.a} using
-                {@code APP_STL := stlport_static}. (You can still use the {@code -static} option
-                with a standalone toolchain.) Compiling a <em>dynamic</em> executable using
-                {@code include $(BUILD_EXECUTABLE)} continues to work because the compiler
-                automatically adds the {@code -ldl} option.</li>
-              <li>If your project links using {@code -nostdlib} and {-Wl,--no-undefined}, you
-                must manually include the {@code -ldl} option.</li>
-            </ul>
-              For more information, see {@code CPLUSPLUS-SUPPORT.html}.
-
-              <p class="note">
-                <strong>Note:</strong> This feature is experimental and works better with the GCC
-                4.6/4.7 compilers than with GCC 4.4.3 or Clang 3.1. Please try it and
-                <a href="http://code.google.com/p/android/issues/list">report any issues</a>.</p>
-          </li>
-          <li>Added a {@code -mstack-protector-guard=} option for x86 to choose between a
-            <em>global</em> default path which is compatible with older Android C library (bionic)
-            and a new <em>tls</em> path (%gs:20) for {@code -fstack-protector},
-            {@code -fstack-protector-all} and {@code -fstack-protector-strong} using the GCC 4.6
-            and higher compilers.
-
-            <p class="note">
-              <strong>Note:</strong> The {@code -mstack-protector-guard} setting itself does not
-              enable any {@code -fstack-protector*} options.</p>
-          </li>
-          <li>Added {@code android_setCpu()} function to
-            {@code sources/android/cpufeatures/cpu-features.c} for use when auto-detection via
-            {@code /proc} is not possible in Android 4.1 and higher.
-            (<a href="http://code.google.com/p/chromium/issues/detail?id=164154">Chromium Issue
-            164154</a>)</li>
-        </ul>
-      </dd>
-
-      <dt>Important bug fixes:</dt>
-      <dd>
-        <ul>
-          <li>Fixed unnecessary rebuild of object files when using the {@code ndk-build} script.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39810">Issue 39810</a>)</li>
-          <li>Fixed a linker failure with the NDK 8c release for Mac OS X 10.6.x that produced the
-            following error:
-            <pre>
-dyld: lazy symbol binding failed: Symbol not found: _memmem
-Referenced from: ...../arm-linux-androideabi/bin/ld
-Expected in: /usr/lib/libSystem.B.dylib</pre>
-            This problem was caused by building on Mac OS X 10.7, which produced binaries that were
-            not compatible with Mac OS 10.6.x and the NDK.
-          </li>
-          <li>Removed the {@code -x c++} options from the Clang++ standalone build script.
-          (<a href="http://code.google.com/p/android/issues/detail?id=39089">Issue 39089</a>)</li>
-          <li>Fixed issues using the {@code NDK_TOOLCHAIN_VERSION=clang3.1} option in Cygwin.
-           (<a href="http://code.google.com/p/android/issues/detail?id=39585">Issue 39585</a>)</li>
-          <li>Fixed the {@code make-standalone-toolchain.sh} script to allow generation of a
-            standalone toolchain using the Cygwin or MinGW environments. The resulting toolchain
-            can be used in Cygwin, MingGW or CMD.exe environments.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39915">Issue 39915</a>,
-            <a href="http://code.google.com/p/android/issues/detail?id=39585">Issue 39585</a>)</li>
-          <li>Added missing {@code SL_IID_ANDROIDBUFFERQUEUESOURCE} option in android-14 builds for
-            ARM and X86.
-            (<a href="http://code.google.com/p/android/issues/detail?id=40625">Issue 40625</a>)</li>
-          <li>Fixed x86 CPU detection for the {@code ANDROID_CPU_X86_FEATURE_MOVBE} feature.
-            (<a href="http://code.google.com/p/android/issues/detail?id=39317">Issue 39317</a>)</li>
-          <li>Fixed an issue preventing the Standard Template Library (STL) from using C++
-            sources that do not have a {@code .cpp} file extension.</li>
-          <li>Fixed GCC 4.6 ARM internal compiler error <em>at reload1.c:1061</em>.
-            (<a href="http://code.google.com/p/android/issues/detail?id=20862">Issue 20862</a>)</li>
-          <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at emit-rtl.c:1954</em>.
-            (<a href="http://code.google.com/p/android/issues/detail?id=22336">Issue 22336</a>)</li>
-          <li>Fixed GCC 4.4.3 ARM internal compiler error <em>at postreload.c:396</em>.
-            (<a href="http://code.google.com/p/android/issues/detail?id=22345">Issue 22345</a>)</li>
-          <li>Fixed problem with GCC 4.6/4.7 skipping lambda functions.
-            (<a href="http://code.google.com/p/android/issues/detail?id=35933">Issue 35933</a>)</li>
-        </ul>
-      </dd>
-
-      <dt>Other bug fixes:</dt>
-      <dd>
-        <ul>
-          <li>NDK header file fixes:
-            <ul>
-              <li>Fixed {@code __WINT_TYPE__} and {@code wint_t} to be the same type.</li>
-              <li>Corrected typo in {@code android/bitmap.h}.
-                (<a href="http://code.google.com/p/android/issues/detail?id=15134">Issue 15134</a>)
-              </li>
-              <li>Corrected typo in {@code errno.h}.</li>
-              <li>Added check for the presence of {@code __STDC_VERSION__} in {@code sys/cdefs.h}.
-                (<a href="http://code.google.com/p/android/issues/detail?id=14627">Issue 14627</a>)
-              </li>
-              <li>Reorganized headers in {@code byteswap.h} and {@code dirent.h}.</li>
-              <li>Fixed {@code limits.h} to include {@code page.h} which provides {@code PAGE_SIZE}
-                settings.
-                (<a href="http://code.google.com/p/android/issues/detail?id=39983">Issue 39983</a>)
-              </li>
-              <li>Fixed return type of {@code glGetAttribLocation()} and
-                {@code glGetUniformLocation()} from {@code int} to {@code GLint}.</li>
-              <li>Fixed {@code __BYTE_ORDER} constant for x86 builds.
-                (<a href="http://code.google.com/p/android/issues/detail?id=39824">Issue 39824</a>)
-              </li>
-            </ul>
-          </li>
-          <li>Fixed {@code ndk-build} script to not overwrite {@code -Os} with {@code -O2} for ARM
-            builds.</li>
-          <li>Fixed build scripts to allow overwriting of {@code HOST_AWK}, {@code HOST_SED}, and
-            {@code HOST_MAKE} settings.</li>
-          <li>Fixed issue for {@code ld.gold} on {@code fsck_msdos} builds linking objects built by
-            the Intel C/C++ compiler (ICC).</li>
-          <li>Fixed ARM EHABI support in Clang to conform to specifications.</li>
-          <li>Fixed GNU Debugger (GDB) to shorten the time spent on walking the target's link map
-            during {@code solib} events.
-            (<a href="http://code.google.com/p/android/issues/detail?id=38402">Issue 38402</a>)</li>
-          <li>Fixed missing {@code libgcc.a} file when linking shared libraries.</li>
-        </ul>
-      </dd>
-
-      <dt>Other changes:</dt>
-      <dd>
-        <ul>
-          <li>Backported 64-bit built-in atomic functions for ARM to GCC 4.6.</li>
-          <li>Added documentation for audio output latency, along with other documentation and
-            fixes.</li>
-          <li>Fixed debug builds with Clang so that non-void functions now raise a {@code SIGILL}
-            signal for paths without a return statement.</li>
-          <li>Updated {@code make-standalone-toolchain.sh} to accept the suffix {@code -clang3.1}
-            which is equivalent to adding {@code --llvm-version=3.1} to the GCC 4.6 toolchain.</li>
-          <li>Updated GCC and Clang bug report URL to:
-            <a href="http://source.android.com/source/report-bugs.html">http://source.android.com/source/report-bugs.html</a></li>
-          <li>Added ARM ELF support to {@code llvm-objdump}.</li>
-          <li>Suppressed <em>treating c input as c++</em> warning for Clang builds.</li>
-          <li>Updated build so that only the 32-bit version of {@code libiberty.a} is built and
-            placed in {@code lib32/}.</li>
-        </ul>
-      </dd>
-    </dl>
-  </div>
-</div>
-
-
-<div class="toggle-content closed">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
       alt="">Android NDK, Revision 8c</a> <em>(November 2012)</em>
   </p>
 
diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd
index 9349a4e..afed043 100644
--- a/docs/html/tools/sdk/tools-notes.jd
+++ b/docs/html/tools/sdk/tools-notes.jd
@@ -28,109 +28,6 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues
 <div class="toggle-content opened">
   <p><a href="#" onclick="return toggleContent(this)">
     <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
-      alt=""/>SDK Tools, Revision 21.0.1</a> <em>(December 2012)</em>
-  </p>
-
-  <div class="toggle-content-toggleme">
-
-    <dl>
-    <dt>Dependencies:</dt>
-    <dd>
-      <ul>
-        <li>Android SDK Platform-tools revision 16 or later.</li>
-        <li>If you are developing in Eclipse with ADT, note that the SDK Tools r21.0.1 is
-          designed for use with ADT 21.0.1 and later. If you haven't already, update your
-        <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 21.0.0.</li>
-        <li>If you are developing outside Eclipse, you must have
-          <a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later.</li>
-    </ul>
-    </dd>
-
-    <dt>General Notes:</dt>
-    <dd>
-      <ul>
-        <li>Build
-          <ul>
-            <li>Updated build to detect and handle package name conflicts between an application and
-              the libraries it depends on. Libraries cannot share package names unless all of them
-              share the same package name.
-              (<a href="http://code.google.com/p/android/issues/detail?id=40152">Issue 40152</a>,
-               <a href="http://code.google.com/p/android/issues/detail?id=40273">Issue 40273</a>)
-            </li>
-            <li>Added a flag to disable dex merging to deal with cases where merging could generate
-              a broken dex file. If this happens to your project, add the following setting to your
-              {@code project.properties} file: {@code dex.disable.merger=true} This setting
-              causes the build system to revert to the older, slower dex processing that does not
-              pre-dex libraries.</li>
-          </ul>
-        </li>
-
-        <li>Renderscript
-          <ul>
-            <li>Added support for
-              <a href="{@docRoot}guide/topics/renderscript/compute.html#filterscript">Filterscript</a>
-              compilation.</li>
-            <li>Added new project setting to control the Renderscript compilation target separately
-              from an Android project. Adding the following line to a {@code project.properties}
-              file causes Renderscript code to be compiled for Android API Level 17, while the
-              containing application can target a different (lower) API level:
-              <pre>renderscript.target = 17</pre>
-              Previously, the Renderscript compilation target was tied to the
-              {@code android:minSdkVersion} setting in the manifest.
-              (<a href="http://code.google.com/p/android/issues/detail?id=40487">Issue 40487</a>)
-            </li>
-          </ul>
-        </li>
-
-      </ul>
-    </dd>
-
-
-    <dt>Bug fixes:</dt>
-    <dd>
-      <ul>
-        <li>Lint
-          <ul>
-            <li>Corrected check for {@code 0px} values in style XML elements.
-              (<a href="http://code.google.com/p/android/issues/detail?id=39601">Issue 39601</a>)
-              </li>
-            <li>Fixed incorrect flagging of formatting strings.
-              (<a href="http://code.google.com/p/android/issues/detail?id=39758">Issue 39758</a>)
-              </li>
-            <li>Fixed problem where {@code tools:ignore} directive in the manifest file was ignored
-              by the Lint tool.
-              (<a href="http://code.google.com/p/android/issues/detail?id=40136">Issue 40136</a>)
-              </li>
-            <li>Fixed problem with flagging a wakelock release inside a conditional.
-              (<a href="http://code.google.com/p/android/issues/detail?id=40424">Issue 40424</a>)
-              </li>
-            <li>Fixed incorrect reporting of missing {@code layout_width} and {@code layout_height}
-              XML fields.
-              (<a href="http://code.google.com/p/android/issues/detail?id=38958">Issue 38958</a>)
-              </li>
-            <li>Fixed handling of custom namespace attributes.</li>
-            <li>Added fixes for filtering out library project warnings.</li>
-            <li>Removed warnings about missing classes before a build.</li>
-          </ul>
-        </li>
-
-        <li>Fixed problem with UI Automator Viewer execution script where Android tools directory
-          is not set.</li>
-        <li>Fixed problem with the SDK Manager so that it auto-selects the most recently released
-          platform on startup.</li>
-        <li>Fixed Java finding script to look for the currently supported version of Java (1.6 or
-          higher).</li>
-        <li>Fixed the SDK Manager launcher in the ADT bundle so that it can properly launch the
-          SDK Manager program when it is placed at the root of the bundle.</li>
-      </ul>
-    </dd>
-    </dl>
-  </div>
-</div>
-
-<div class="toggle-content closed">
-  <p><a href="#" onclick="return toggleContent(this)">
-    <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
       alt=""/>SDK Tools, Revision 21</a> <em>(November 2012)</em>
   </p>