am f3382443: am 46ba5456: am 708b56ed: Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."

* commit 'f3382443cde82feeb1ceee32a2538f96fba44b80':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.