ARM: Fix VFP merge derp

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>