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

Change-Id: Ie4fd3fe54b06d7061e4d9e57786a361c91a7ab77