Merge "Include videoeditor_jni in sdk product build." into jb-mr1-dev