Merge "Fix for 3431967: Memory leak from video editor engine in JNI"