Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee' * commit '2c43b6cee14cde6721689239e47d32319dbbf6ee': Fix jni registration typo
Merge commit '2c43b6cee14cde6721689239e47d32319dbbf6ee' * commit '2c43b6cee14cde6721689239e47d32319dbbf6ee': Fix jni registration typo