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

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