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

Change-Id: I1a6c13f9fd00d082425b374e440e5d8482260b73