Merge "Fix a deadlock in the breakpoint code." into dalvik-dev