am 01a0ebb6: Merge "Make 32bit run-tests work correctly on 64bit default devices."

* commit '01a0ebb6b96c32879dcad99d515fc0cd8de2a266':
  Make 32bit run-tests work correctly on 64bit default devices.