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

Change-Id: I704080d3be3170b4d3046e492d19b4e789be9177