Merge "ARM: Avoid branches to branches"
am: e21c9af9a8

Change-Id: Idf34e13c9ae8f7a800e6ec70e85ffbbd6949b743