cabi_arm: Fix merge failure that resulted in duplicated code