Merge "Fix gdbclient.py -p."
am: 37c32c3162

Change-Id: I051679423bdff53539c4455faa5d73fed2d4c0a8