am ef4d1341: Merge "Don\'t define DISALLOW_COPY_AND_ASSIGN."

* commit 'ef4d1341e70d2683d5d9f2a8892535ae90eb184c':
  Don't define DISALLOW_COPY_AND_ASSIGN.