Merge "Give directions on attaching gdb to run-test target"
am: d0353ab20c

Change-Id: I1d46bad8f3a6123d633e0f296bccdfc433f6faab