diff --git a/ndk/platforms/android-18/samples/Teapot/AndroidManifest.xml b/ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/AndroidManifest.xml
rename to ndk/platforms/android-17/samples/Teapot/AndroidManifest.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/assets/Shaders/ShaderPlain.fsh b/ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/assets/Shaders/ShaderPlain.fsh
rename to ndk/platforms/android-17/samples/Teapot/assets/Shaders/ShaderPlain.fsh
diff --git a/ndk/platforms/android-18/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh b/ndk/platforms/android-17/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh
rename to ndk/platforms/android-17/samples/Teapot/assets/Shaders/VS_ShaderPlain.vsh
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/Android.mk b/ndk/platforms/android-17/samples/Teapot/jni/Android.mk
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/Android.mk
rename to ndk/platforms/android-17/samples/Teapot/jni/Android.mk
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/Application.mk b/ndk/platforms/android-17/samples/Teapot/jni/Application.mk
similarity index 69%
rename from ndk/platforms/android-18/samples/Teapot/jni/Application.mk
rename to ndk/platforms/android-17/samples/Teapot/jni/Application.mk
index 824495d8c..39b678dc1 100644
--- a/ndk/platforms/android-18/samples/Teapot/jni/Application.mk
+++ b/ndk/platforms/android-17/samples/Teapot/jni/Application.mk
@@ -1,4 +1,4 @@
 APP_PLATFORM := android-9
-APP_ABI := armeabi-v7a
+APP_ABI := all
 
 APP_STL := stlport_static
\ No newline at end of file
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/JNIHelper.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/JNIHelper.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/NDKSupport.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/NDKSupport.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/NDKSupport.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/NDKSupport.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/gestureDetector.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/gestureDetector.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/perfMonitor.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/perfMonitor.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/perfMonitor.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/perfMonitor.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/perfMonitor.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/shader.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/shader.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/shader.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/shader.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/shader.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/tapCamera.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/tapCamera.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/tapCamera.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/tapCamera.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/tapCamera.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/vecmath.cpp b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/vecmath.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/vecmath.h b/ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/NDKSupport/vecmath.h
rename to ndk/platforms/android-17/samples/Teapot/jni/NDKSupport/vecmath.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/TeapotNativeActivity.cpp b/ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/TeapotNativeActivity.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/TeapotNativeActivity.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/TeapotRenderer.cpp b/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.cpp
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/TeapotRenderer.cpp
rename to ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.cpp
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/TeapotRenderer.h b/ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.h
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/TeapotRenderer.h
rename to ndk/platforms/android-17/samples/Teapot/jni/TeapotRenderer.h
diff --git a/ndk/platforms/android-18/samples/Teapot/jni/teapot.inl b/ndk/platforms/android-17/samples/Teapot/jni/teapot.inl
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/jni/teapot.inl
rename to ndk/platforms/android-17/samples/Teapot/jni/teapot.inl
diff --git a/ndk/platforms/android-18/samples/Teapot/lint.xml b/ndk/platforms/android-17/samples/Teapot/lint.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/lint.xml
rename to ndk/platforms/android-17/samples/Teapot/lint.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/project.properties b/ndk/platforms/android-17/samples/Teapot/project.properties
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/project.properties
rename to ndk/platforms/android-17/samples/Teapot/project.properties
diff --git a/ndk/platforms/android-18/samples/Teapot/res/drawable-hdpi/ic_launcher.png b/ndk/platforms/android-17/samples/Teapot/res/drawable-hdpi/ic_launcher.png
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/drawable-hdpi/ic_launcher.png
rename to ndk/platforms/android-17/samples/Teapot/res/drawable-hdpi/ic_launcher.png
diff --git a/ndk/platforms/android-18/samples/Teapot/res/drawable-ldpi/ic_launcher.png b/ndk/platforms/android-17/samples/Teapot/res/drawable-ldpi/ic_launcher.png
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/drawable-ldpi/ic_launcher.png
rename to ndk/platforms/android-17/samples/Teapot/res/drawable-ldpi/ic_launcher.png
diff --git a/ndk/platforms/android-18/samples/Teapot/res/drawable-mdpi/ic_launcher.png b/ndk/platforms/android-17/samples/Teapot/res/drawable-mdpi/ic_launcher.png
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/drawable-mdpi/ic_launcher.png
rename to ndk/platforms/android-17/samples/Teapot/res/drawable-mdpi/ic_launcher.png
diff --git a/ndk/platforms/android-18/samples/Teapot/res/drawable-xhdpi/ic_launcher.png b/ndk/platforms/android-17/samples/Teapot/res/drawable-xhdpi/ic_launcher.png
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/drawable-xhdpi/ic_launcher.png
rename to ndk/platforms/android-17/samples/Teapot/res/drawable-xhdpi/ic_launcher.png
diff --git a/ndk/platforms/android-18/samples/Teapot/res/layout/widgets.xml b/ndk/platforms/android-17/samples/Teapot/res/layout/widgets.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/layout/widgets.xml
rename to ndk/platforms/android-17/samples/Teapot/res/layout/widgets.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/res/values-v11/styles.xml b/ndk/platforms/android-17/samples/Teapot/res/values-v11/styles.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/values-v11/styles.xml
rename to ndk/platforms/android-17/samples/Teapot/res/values-v11/styles.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/res/values-v14/styles.xml b/ndk/platforms/android-17/samples/Teapot/res/values-v14/styles.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/values-v14/styles.xml
rename to ndk/platforms/android-17/samples/Teapot/res/values-v14/styles.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/res/values/strings.xml b/ndk/platforms/android-17/samples/Teapot/res/values/strings.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/values/strings.xml
rename to ndk/platforms/android-17/samples/Teapot/res/values/strings.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/res/values/styles.xml b/ndk/platforms/android-17/samples/Teapot/res/values/styles.xml
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/res/values/styles.xml
rename to ndk/platforms/android-17/samples/Teapot/res/values/styles.xml
diff --git a/ndk/platforms/android-18/samples/Teapot/src/com/sample/teapot/TeapotApplication.java b/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
rename to ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotApplication.java
diff --git a/ndk/platforms/android-18/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java b/ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
similarity index 100%
rename from ndk/platforms/android-18/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java
rename to ndk/platforms/android-17/samples/Teapot/src/com/sample/teapot/TeapotNativeActivity.java