diff --git a/Android.mk b/Android.mk
index 630f0fe..cfd5113 100644
--- a/Android.mk
+++ b/Android.mk
@@ -57,6 +57,4 @@
 
 LOCAL_MODULE:= libFraunhoferAAC
 
-LOCAL_CLANG:= false
-
 include $(BUILD_STATIC_LIBRARY)
diff --git a/libSYS/src/genericStds.cpp b/libSYS/src/genericStds.cpp
index 3381e37..72b5467 100644
--- a/libSYS/src/genericStds.cpp
+++ b/libSYS/src/genericStds.cpp
@@ -116,7 +116,7 @@
 
 
 /* Include OS/System specific implementations. */
-#if defined(__linux__)	/* cppp replaced: elif */
+#if defined(__linux__) && !defined(__ANDROID__) /* cppp replaced: elif */
   #include "linux/genericStds_linux.cpp"
 #endif