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

Change-Id: I04472a29b7d900cf5d8980e3d1d5a82d7a8af2b8