Merge "DO NOT MERGE: Add SurfaceFlingerPerfTests" into tm-qpr-dev