Merge "Fix JNIEnv-on-wrong-thread abort message."
am: fbb0323d80

* commit 'fbb0323d801cd14fb04eb4af7e88792d7cca8de3':
  Fix JNIEnv-on-wrong-thread abort message.

Change-Id: I262af3eef26509a6bb5a57e122141ba7ac122a7b