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