Merge "Make cppreopts.sh deal with new layout"