Merge "Fix jni registration typo" into gingerbread