Merge changes If3859447,I56084c42 into integration

* changes:
  feat(plat/arm/sgi): add CPU specific handler for Neoverse N2
  feat(plat/arm/sgi): add CPU specific handler for Neoverse V1