Merge "Try a bit harder to look like gdb(1)." into dalvik-dev