Merge "Add note about build_timeout"