am 67c20928: Merge "For 64-bit, use 32-bit DEXPREOPT if zygote64 isn\'t enabled."

* commit '67c209281ff0454213bc117691214bc67ad5a7f2':
  For 64-bit, use 32-bit DEXPREOPT if zygote64 isn't enabled.