Merge "videoeditor JNI files on honeycomb" into honeycomb