Merge change Ic5ec30e2

* changes:
  [target/msm7630]: Change MACH IDs for 8x55_surf and 8x55_ffa targets.