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

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

Change-Id: Ib398eebbc4dcf48f09e96c4993584a5bd3a45711