am 7840dfaf: am 5301a56c: Merge "Revert "Remove dependency of...
am 7840dfaf: am 5301a56c: Merge "Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"" into jb-dev
* commit '7840dfaf':
Revert "Remove dependency of libvideoeditor_jni.so on static libs from video editor engine"