Merge "Revert "ARM: Improve the code generated for HCondition with a constant input""