Update Telecomm to use new wrappers and aidl paths

Change-Id: If9e5cf619defd5347b145591a416004cf0072c95
diff --git a/src/com/android/telecomm/CallServiceAdapter.java b/src/com/android/telecomm/CallServiceAdapter.java
index 8daa16e..3e63f39 100644
--- a/src/com/android/telecomm/CallServiceAdapter.java
+++ b/src/com/android/telecomm/CallServiceAdapter.java
@@ -19,8 +19,8 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.telecomm.CallInfo;
-import android.telecomm.ICallServiceAdapter;
 
+import com.android.internal.telecomm.ICallServiceAdapter;
 import com.google.android.collect.Sets;
 import com.google.common.base.Strings;
 
@@ -74,12 +74,12 @@
     }
 
     /** {@inheritDoc} */
-    @Override public void setCompatibleWith(String callId, boolean isCompatible) {
+    @Override public void setIsCompatibleWith(String callId, boolean isCompatible) {
         // TODO(santoscordon): fill in.
     }
 
     /** {@inheritDoc} */
-    @Override public void handleIncomingCall(final CallInfo callInfo) {
+    @Override public void notifyIncomingCall(final CallInfo callInfo) {
         checkValidCallId(callInfo.getId());
         mHandler.post(new Runnable() {
             @Override public void run() {