Merge "Correctly register native methods."