Merge "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine" into jb-dev