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

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