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

Change-Id: If45aaa6db09122fc08d7043df3807a45d11676a0