[Feature][ZXW-88]merge P50 version

Only Configure: No
Affected branch: master
Affected module: unknown
Is it affected on both ZXIC and MTK: only ZXIC
Self-test: Yes
Doc Update: No

Change-Id: I34667719d9e0e7e29e8e4368848601cde0a48408
diff --git a/ap/os/linux/linux-3.4.x/net/Makefile b/ap/os/linux/linux-3.4.x/net/Makefile
old mode 100644
new mode 100755
index 6865dab..3f9d8c1
--- a/ap/os/linux/linux-3.4.x/net/Makefile
+++ b/ap/os/linux/linux-3.4.x/net/Makefile
@@ -71,3 +71,4 @@
 obj-$(CONFIG_NFC)		+= nfc/
 obj-$(CONFIG_OPENVSWITCH)	+= openvswitch/
 obj-$(CONFIG_NET_ACTIVITY_STATS)		+= activity_stats.o
+obj-$(CONFIG_IPC_SOCKET) += socket_rpmsg.o