Merge "Change buildspec to allow disabling SVG."