Merge "Adjust to new OpenNativeLibrary API."
am: 319157a906

Change-Id: I0c5fb4e4c603ab10dfad2f5ca7a4b97710d51d57