SPARK-2565. Update ShuffleReadMetrics as blocks are fetched

nit: Import ordering