fps: Added parameter to override FPS collection method
fps: Added parameter to override FPS collection method

In Android M and above, there is a new method of collecting fps
statistics, using gfxinfo rather than SurfaceFlinger, but the
SF method is still available however.
This parameter lets the user decide whether to always use SF,
or to allow the instrument to pick the best method based on
Android version it detects.

Sticklyman1936/workload-automation,bjackman/workload-automation,Sticklyman1936/workload-automation,Sticklyman1936/workload-automation,jimboatarm/workload-automation,Sticklyman1936/workload-automation,jimboatarm/workload-automation,bjackman/workload-automation,bjackman/workload-automation,bjackman/workload-automation,bjackman/workload-automation,jimboatarm/workload-automation,Sticklyman1936/workload-automation,jimboatarm/workload-automation,Sticklyman1936/workload-automation,jimboatarm/workload-automation,jimboatarm/workload-automation,bjackman/workload-automation