Merge "Move --dump-cfg and dump-cfg-append to CompilerOptions."
am: 7d6872a247

* commit '7d6872a2471a20a10fc99b02459db89a5fc2dc1d':
  Move --dump-cfg and dump-cfg-append to CompilerOptions.