Merge the enabling by default of ARM_PATCH_PHYS_VIRT