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

Change-Id: Ieb550c133406e953a21310985f01d981b797ee08