Merge "Minor field name cleanup in debugger." into dalvik-dev