Merge "Fix breakpoint handling on switch statements." into dalvik-dev