Merge "Remove __ARM_HAVE_VFP."