am 9fd0a9c1: am 3b99337e: Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv." into klp-dev
am 9fd0a9c1: am 3b99337e: Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv." into klp-dev

* commit '9fd0a9c1aefb157ccffe04db006c573067a624bb':
  Support apps that pass JNI_VERSION_1_1 to GetEnv.

treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst,treadstoneproject/artinst