Merge "Always call into native loader when loading a native library"
am: a307a76312

Change-Id: If95ef0850a6e62b686c6d07d14915bd26e91aab6