Merge "Always call into native loader when load a native library" am: e266c37559
am: 808bd1765f

Change-Id: I63495e45a1eafe2dd92c30f315289f5ca2d17070