Merge "gdbclient.py: Try ro.build.product also." am: 8240673629

Original change: https://android-review.googlesource.com/c/platform/development/+/1421388

Change-Id: Ie6c85bf109b9c84ce03ac9b9d162f2d4ebb635d1