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

Change-Id: Ia9b31696af0f4371ee5a3ecb65c5ba3f6e7218f3