Merge "Reconcile binder JNI with earlier changes, removing lock."