Merge "Don't define DISALLOW_COPY_AND_ASSIGN if already defined."