Merge "Fix a bug, where one thread is using JNIEnv associated with another thread." into gingerbread