Merge "ARM: Reduce the number of branches generated for HCondition and HSelect"