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

Change-Id: I1b4544d48d3248edc5621af1218b38a3ad0d9cae