Fix run-gtests.sh for both 32- and 64-bit tests. am: ba25318266
am: 5451f30566

Change-Id: I118ae277f172977a813d17820d74514d40b85fad