Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev