Merge "Revert "Revert "Update for less arguments in hidl toBinder."""

am: e8341b6148

Change-Id: I1337a9b40fdf762cc0150983536981f0a163750a

core/jni/android_os_HwBinder.cpp

@@ -383,8 +383,7 @@ static jobject JHwBinder_native_getService(
         return NULL;
     }
 
-    sp<hardware::IBinder> service = hardware::toBinder<
-            hidl::base::V1_0::IBase, hidl::base::V1_0::BpHwBase>(ret);
+    sp<hardware::IBinder> service = hardware::toBinder<hidl::base::V1_0::IBase>(ret);
 
     if (service == NULL) {
         signalExceptionForError(env, NAME_NOT_FOUND);