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

Change-Id: I07e2b1c1efd0cc8eec73467fdd4ef88bf36f081c