[SPARK-2208] fix zero shuffle wait time in fast machine

nit: import ordering should abide by the [style guide](https://cwiki.apache.org/confluence/display/SPARK/Spark+Code+Style+Guide#SparkCodeStyleGuide-Imports)