Merge change 3997

* changes:
  Rename vfp to arm-vfp.