Merge "Fix use of native loader API."