Merge "SurfaceFlinger: Last minute log removal." into oc-dev am: 56cca289cc
am: a75a975dc8

Change-Id: I169d4fabb6b915912df38ad267c0de5b6d7f9fdc