Pass cpp-options to UHC.
Merge pull request #1697 from nick8325/master

Pass cpp-options to UHC.