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

Change-Id: Ia0d8baed4a5de3a1580832092e931165d9802605