Merge "Fix braino when handling branches fallthrough in arm backend. am: 860626e1a3 am: 66394983fb" into oc-dr1-dev-plus-aosp