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

Change-Id: Ib4448b62b985fac82c24fb81aef550ba7d0280a9