Merge changes Icfaa316b,Ic26706d7 into main

* changes:
  Add missing libc++ includes
  No need to modify acc for std::accumulate