Merge a39de114f0ce6d73ed1e84582c0f66b227fb9d6e on remote branch

Change-Id: Ib64927bbe7b43551d6e6f6179f67b460fd7ba093
diff --git a/jni/android_hardware_fm.cpp b/jni/android_hardware_fm.cpp
index 76490ee..6809a27 100644
--- a/jni/android_hardware_fm.cpp
+++ b/jni/android_hardware_fm.cpp
@@ -486,6 +486,7 @@
             return;
         }
         vm->DetachCurrentThread();
+        mCallbackEnv = NULL;
     }
 }