am 2c43b6ce: am d9452ecd: Merge "Fix jni registration typo" into gingerbread

Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee'

* commit '2c43b6cee14cde6721689239e47d32319dbbf6ee':
  Fix jni registration typo