Merge commit 'c519c4a'

Conflicts:
	build/android/Android.mk

diff --cc build/android/Android.mk
index 4a2add8f61fd0857b60f62a2fb072a7a38b5bae8,c2c13beb999f2f7baa0b6eefe8effd6417979dc8..a6a6ae97f8b8b987d0ce701c569fadf7c53d5020
--- 1/build/android/Android.mk
--- 2/build/android/Android.mk
+++ b/build/android/Android.mk
@@@ -82,8 -85,14 +85,14 @@@ LOCAL_STATIC_LIBRARIES := 
        libosip2 \
        libgsm
  
+ 
  ifeq ($(LINPHONE_VIDEO),1)
 -LOCAL_STATIC_LIBRARIES += \
+ ifeq ($(BUILD_X264),1)
+ LOCAL_STATIC_LIBRARIES += \
+       libmsx264 \
+       libx264 
+ endif
 +LOCAL_SHARED_LIBRARIES += \
        libavcodec \
        libswscale \
        libavcore \