Merge "Fix interpreter debug attach" into dalvik-dev