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

Change-Id: I4a1819a3aa9f4c5aa7233225bdae29435272cade