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

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

Change-Id: Id8b7e4068ac9d18c09fba4b0f633cd3e17c06120