Merge "SurfaceFlinger supports ClearClientTarget for Sideband" am: 6560727f37
am: adde06b9e8

Change-Id: I68e33ab1173bbae30e8d22ae86397ec081051f7f