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

Change-Id: If0a88b2e49b588556c3512ea90afbff0bff2f784