Merge "Fix gdbclient.py -p." am: 37c32c3162 am: 82a266c27b
am: 257f691b4e

Change-Id: Ib21fa0272fb89e9c1ebcf9703b4677fe86d64a48