Merge "Merge "SurfaceFlinger: Last minute log removal." into oc-dev am: 56cca289 am: d5547979" into oc-dr1-dev-plus-aosp