Merge "Fix phantom reference based cleanup of JNI-created buffer"