Merge camera jni from cm-10.2