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