Merge "Revert "ARM: Improve the code generated for HCondition with a constant input"" am: c8a5b6c38a am: 33e3a6aa0f
am: fba8c313ff

Change-Id: I9c70381b661986d10fd6c3e137c5c57b70ceec0b