Merge "Always call into native loader when loading a native library"