Merge "Make cppreopts.sh deal with new layout"
am: cf29d5254c

Change-Id: Ie9db469d29e292d3b44daaea2b274b0b37603920