Merge "Update 64bit tests to also use EMULATOR_BUILD_64BITS." into idea133
 Auto-merge: ca81e42

* commit 'ca81e422fae4527ab4d5a311daa8adf34cd0bbf3':
  Update 64bit tests to also use EMULATOR_BUILD_64BITS.