am c60b87a5: am a850f9a1: Merge "Do not preload videoeditor_jni since it...
am c60b87a5: am a850f9a1: Merge "Do not preload videoeditor_jni since it breaks the emulator" into jb-mr1-dev
* commit 'c60b87a5':
Do not preload videoeditor_jni since it breaks the emulator