Merge "Rename native methods that were changed in the platform"