Spark-742: TaskMetrics should not employ per-record timing.

This commit merges together all the changes for purpose of cherry-picking

Conflicts:

	core/src/main/scala/spark/BlockStoreShuffleFetcher.scala