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

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