Revert "Make sure to delete jni_id_manager_ on shutdown." am: 3b2905366c
am: a2699d2d48

Change-Id: I66340836f1fca86cef15412840ef54aa83ab7fd4