am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread

Merge commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6'

* commit 'f17bd19acbb88429b50a1497bfec0752b456d5c6':
  Use new nativeLibraryPath field for NativeActivity

xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base,xorware/android_frameworks_base