Make sure to delete jni_id_manager_ on shutdown. am: d5d645ffec
am: 7b94ac6e0e

Change-Id: I63e83c9da509d3c9af5fa1aaa1417204521a1381