Merge "Move --dump-cfg and dump-cfg-append to CompilerOptions."