Merge "SurfaceFlinger: clear LayerHistory on touch" into qt-r1-dev am: a834dd6da4
am: 3a2422bec0

Change-Id: Iada334e77eab43d81b643a3c1d5d6aa65916f75d