diff --git a/android/jni/Android.mk b/android/jni/Android.mk
index 280f05cf76..dbd136c7ca 100644
--- a/android/jni/Android.mk
+++ b/android/jni/Android.mk
@@ -2,6 +2,8 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
+#LOCAL_CPP_FEATURES += exceptions rtti
+
 LOCAL_MODULE    := mapswithme
 
 #LOCAL_CFLAGS := -DANDROID_NDK \
@@ -9,6 +11,7 @@ LOCAL_MODULE    := mapswithme
 
 LOCAL_CFLAGS := -ffunction-sections -fdata-sections
 
+TARGET_PLATFORM := android-5
 
 LOCAL_HEADER_FILES := \
  	com/mapswithme/core/jni_helper.hpp \
@@ -38,7 +41,7 @@ LOCAL_SRC_FILES := \
 LOCAL_LDLIBS := -llog -lGLESv1_CM \
   	-lwords -lmap -lversion -lsearch -lstorage -lindexer -lyg -lplatform \
   	-lgeometry -lcoding -lbase -lexpat -lfreetype -lfribidi -lzlib -lbzip2 \
-  	-ljansson -ltomcrypt ./obj/local/armeabi/libstdc++.a
+	-ljansson -ltomcrypt -lprotobuf ./obj/local/armeabi/libstdc++.a
 
 LOCAL_LDLIBS += -L../../omim-android-debug/out/debug
 #LOCAL_LDLIBS += -L../../omim-android-release/out/release
diff --git a/android/jni/Application.mk b/android/jni/Application.mk
index 281da9980e..674d249230 100644
--- a/android/jni/Application.mk
+++ b/android/jni/Application.mk
@@ -1,7 +1,10 @@
+APP_PLATFORM := android-5
+APP_ABI := armeabi
 APP_STL := gnustl_static
 APP_CFLAGS += -I../3party/boost
-APP_CPPFLAGS += -fexceptions -frtti
 
-# comment this to enable release build
+# comment/uncomment this to enable release build
 APP_OPTIM := debug
-APP_CFLAGS += -DDEBUG -D_DEBUG
\ No newline at end of file
+APP_CFLAGS += -DDEBUG -D_DEBUG
+#APP_OPTIM := release
+#APP_CFLAGS += -DRELEASE -D_RELEASE
diff --git a/platform/platform_android.cpp b/platform/platform_android.cpp
index 6b3becabb9..3665b295e6 100644
--- a/platform/platform_android.cpp
+++ b/platform/platform_android.cpp
@@ -135,3 +135,8 @@ bool Platform::GetFileSize(string const & file, uint64_t & size) const
     return false;
   }
 }
+
+string Platform::UniqueClientId() const
+{
+  return "@TODO";
+}
diff --git a/tools/mkspecs/android-g++/qmake.conf b/tools/mkspecs/android-g++/qmake.conf
index 90d79eb903..9e6e95ff49 100644
--- a/tools/mkspecs/android-g++/qmake.conf
+++ b/tools/mkspecs/android-g++/qmake.conf
@@ -12,7 +12,7 @@ include(qws.conf)
 
 NDK_TOOLCHAIN_PREFIX = arm-linux-androideabi
 NDK_TOOLCHAIN_VERSION = 4.4.3
-ANDROID_PLATFORM = android-9
+ANDROID_PLATFORM = android-5
 ANDROID_TARGET_ARCH = armeabi
 
 NDK_TOOLCHAIN = $$NDK_TOOLCHAIN_PREFIX-$$NDK_TOOLCHAIN_VERSION
diff --git a/yg/internal/opengl.hpp b/yg/internal/opengl.hpp
index 794614282b..89bd367333 100644
--- a/yg/internal/opengl.hpp
+++ b/yg/internal/opengl.hpp
@@ -24,6 +24,7 @@
 
 #elif defined(OMIM_OS_ANDROID)
   #include <GLES/gl.h>
+  #define GL_GLEXT_PROTOTYPES
   #include <GLES/glext.h>
   #define OMIM_GL_ES