Merge changes Ie828d9b4,I5ddd6323 into pi-dev

* changes:
  SF TimeStats: move dumpStats into TimeStatsHelper
  SF TimeStats: update build file and some cleanups