am cc19cb68: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN if already defined."

* commit 'cc19cb6845f427036513e155d50c11533933c63f':
  Don't define DISALLOW_COPY_AND_ASSIGN if already defined.