Merge "Fix braino when handling branches fallthrough in arm backend." am: 3b9aee8447
am: acb72449c5

Change-Id: Ieb0c149b41149e189eea98d39009920e89a95fe6