Merge "SurfaceFlinger TimeStats" into pi-dev am: a6e7d841b3
am: 7111267578

Change-Id: Id709e1ec2aaac9470403d31fcc74117054f9b4ef