Format cpp files with new astyle rules

Change-Id: Ic622c34d3c7df8d3c8f81e95d30d330b41c1ce6c