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

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

Change-Id: Id2802a0a452a37b539b6ada269ac431903456ebd