Merge "Do not log surface destroy by default" into nyc-mr1-dev
am: dc02317d92

Change-Id: I5ad4e2a8f96e32a79eb95603ad9dba3d672feb62