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