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

Change-Id: If4974c947886ac5c5bebc40a7bc76e7cdd881739