Merge "cppreopts: Move to sh_binary" am: 72598e4766
am: 3882a4328a

Change-Id: Id529ae3da07bed005e8f6359da7c20fa1a479079