Make 32bit run-tests work correctly on 64bit default devices.

Change-Id: I7a5ca303ab91dec0df95358435e4a56c18a7fce3
2 files changed