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

* commit '46ba5456ad33e0674929eefff0753e21301e6eba':
  Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty.