Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp * commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405': Fix jni registration typo
Merge commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405' into gingerbread-plus-aosp * commit 'd9452ecd0ce6c8e0518055929ba1fd0712146405': Fix jni registration typo