Merge "Move single-step control into thread." into dalvik-dev