Merge "Add missing native methods to fix boot." into gingerbread