Merge "Remove libvideoeditor_jni.so's dependency on static libs in video editor engine" into jb-dev