Merge "Fix a crash during the VM shutdown." into dalvik-dev