diff --git a/src/modules/video_render/main/source/Android.mk b/src/modules/video_render/main/source/Android.mk
index b7d9ac9edb..2f8e543cfa 100644
--- a/src/modules/video_render/main/source/Android.mk
+++ b/src/modules/video_render/main/source/Android.mk
@@ -14,8 +14,8 @@ LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_video_render
 LOCAL_MODULE_TAGS := optional
 LOCAL_CPP_EXTENSION := .cc
-LOCAL_GENERATED_SOURCES :=
-LOCAL_SRC_FILES := incoming_video_stream.cc \
+LOCAL_SRC_FILES := \
+    incoming_video_stream.cc \
     video_render_frames.cc \
     video_render_impl.cc \
     external/video_render_external_impl.cc \
@@ -25,40 +25,27 @@ LOCAL_SRC_FILES := incoming_video_stream.cc \
     Android/video_render_opengles20.cc 
 
 # Flags passed to both C and C++ files.
-MY_CFLAGS :=  
-MY_CFLAGS_C :=
-MY_DEFS := '-DNO_TCMALLOC' \
-    '-DNO_HEAPCHECKER' \
-    '-DWEBRTC_TARGET_PC' \
-    '-DWEBRTC_LINUX' \
-    '-DWEBRTC_THREAD_RR' \
-    '-DWEBRTC_ANDROID' \
-    '-DANDROID' 
+LOCAL_CFLAGS := \
+    $(MY_WEBRTC_COMMON_DEFS)
 
-LOCAL_CFLAGS := $(MY_CFLAGS_C) $(MY_CFLAGS) $(MY_DEFS)
-
-# Include paths placed before CFLAGS/CPPFLAGS
-LOCAL_C_INCLUDES := $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/. \
+LOCAL_C_INCLUDES := \
+    $(LOCAL_PATH) \
+    $(LOCAL_PATH)/Android \
     $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../interface \
-    $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../../system_wrappers/interface \
-    $(LOCAL_PATH)/../../../utility/interface \
+    $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../audio_coding/main/interface \
-    $(LOCAL_PATH)/Android
+    $(LOCAL_PATH)/../../../interface \
+    $(LOCAL_PATH)/../../../utility/interface \
+    $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
+    $(LOCAL_PATH)/../../../../system_wrappers/interface 
 
-# Flags passed to only C++ (and not C) files.
-LOCAL_CPPFLAGS := 
-
-LOCAL_LDFLAGS :=
-
-LOCAL_STATIC_LIBRARIES :=
-
-LOCAL_SHARED_LIBRARIES := libcutils \
+# TODO(leozwang) organize shared library in a better way
+LOCAL_SHARED_LIBRARIES := \
+    libcutils \
     libdl \
     libstlport
-LOCAL_ADDITIONAL_DEPENDENCIES :=
 
+ifndef NDK_ROOT
 include external/stlport/libstlport.mk
+endif
 include $(BUILD_STATIC_LIBRARY)
diff --git a/src/modules/video_render/main/source/video_render_impl.cc b/src/modules/video_render/main/source/video_render_impl.cc
index c752009f55..5d27a73153 100644
--- a/src/modules/video_render/main/source/video_render_impl.cc
+++ b/src/modules/video_render/main/source/video_render_impl.cc
@@ -39,7 +39,7 @@
 #include "mac/video_render_mac_carbon_impl.h"
 #endif
 
-#elif defined(ANDROID)
+#elif defined(WEBRTC_ANDROID)
 #include "Android/video_render_android_impl.h"
 #include "Android/video_render_android_surface_view.h"
 #include "Android/video_render_android_native_opengl2.h"
@@ -99,7 +99,7 @@ void VideoRender::DestroyVideoRender(
 
 WebRtc_Word32 VideoRender::SetAndroidObjects(void *javaVM)
 {
-#ifdef ANDROID
+#ifdef WEBRTC_ANDROID
     return VideoRenderAndroid::SetAndroidEnvVariables(javaVM);
 #else
     return -1;
@@ -170,7 +170,7 @@ ModuleVideoRenderImpl::ModuleVideoRenderImpl(
         break;
 #endif
 
-#elif defined(ANDROID)
+#elif defined(WEBRTC_ANDROID)
         case kRenderAndroid:
         {
             if(AndroidNativeOpenGl2Renderer::UseOpenGL2(window))
@@ -298,7 +298,7 @@ ModuleVideoRenderImpl::~ModuleVideoRenderImpl()
             case kRenderiPhone:
             break;
 
-#elif defined(ANDROID)
+#elif defined(WEBRTC_ANDROID)
             case kRenderAndroid:
             {
                 VideoRenderAndroid* ptrRenderer = reinterpret_cast<VideoRenderAndroid*> (_ptrRenderer);