Fix style.
Merge topic 'target-COMPILE_OPTIONS' into next

813e162 Fix style.