am 8a90a308: am 426514ca: Merge "Allow null current thread in jni weak ref decode during shutdown."

* commit '8a90a308bb31a95f013e3ccc8fc1ac36168fd197':
  Allow null current thread in jni weak ref decode during shutdown.