am 5e1c205f: Merge "Prevent spurious dexopts in 32-64 builds."

* commit '5e1c205fc170d0e3b4834e17475024979debd05e':
  Prevent spurious dexopts in 32-64 builds.