Merge "Binder linkage no longer depends on JNI objrefs as persistent tokens"