am 5be45143: Merge "Support apps that pass JNI_VERSION_1_1 to GetEnv."

* commit '5be4514308117d4bdd94c177544687d2d9be021f':
  Support apps that pass JNI_VERSION_1_1 to GetEnv.