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

Merge commit '2cb3e83654c99e202c170d9d0237d8d1f4054354' into gingerbread-plus-aosp

* commit '2cb3e83654c99e202c170d9d0237d8d1f4054354':
  Use new nativeLibraryPath field for NativeActivity