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

Change-Id: I5c78a66475e3bd632c26c15df5a4c00944983343