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

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

Change-Id: I1928129f80fda0549fbc9cc94da89fec85b9e048