Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread