Merge "Update indentation to 2 spaces for build_mixed"