am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for...
am f17bd19a: am 2cb3e836: Merge "Use new nativeLibraryPath field for NativeActivity" into gingerbread
Merge commit 'f17bd19a'
* commit 'f17bd19a':
Use new nativeLibraryPath field for NativeActivity