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

* commit '3b99337ec2a92ca5fc0b3bd1d44be40e5eb2a30f':
  Support apps that pass JNI_VERSION_1_1 to GetEnv.