ARM: Fix bad merge bd1274dc005 (Merge branch 'v6v7' into devel)