Merge "Re-add mistakenly removed lock in SurfaceFlinger::removeLayer."