Merge "Make sure DEX2OAT_TARGET_CPU_VARIANT is not empty."