Make sure to delete jni_id_manager_ on shutdown.
am: d5d645ffec

Change-Id: I9526ae9fafeae4eeedba5d28252c9da81057dd77