resolve merge conflicts of ee6b4b6467 to master.

Change-Id: Ia17df264a6d7800a8fd2f0d39c2017ab48181894

diff --cc libs/binder/Android.mk
index e8f0981,adb9674..9862f9e
--- 1/libs/binder/Android.mk
--- 2/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@@ -27,11 -27,9 +27,11 @@@ sources := 
      IPCThreadState.cpp \
      IPermissionController.cpp \
      IProcessInfoService.cpp \
 +    IResultReceiver.cpp \
 +    ProcessInfoService.cpp \
      IServiceManager.cpp \
-     MemoryDealer.cpp \
      MemoryBase.cpp \
+     MemoryDealer.cpp \
      MemoryHeapBase.cpp \
      Parcel.cpp \
      PermissionCache.cpp \