Fix rebase issues

Author: jerryshao

core/src/main/scala/org/apache/spark/shuffle/sort/SortShuffleReader.scala

@@ -164,8 +164,8 @@ private[spark] class SortShuffleReader[K, C](
       MergeUtil.mergeSort(finalItrGroup, keyComparator, dep.keyOrdering, dep.aggregator)
 
     // Update the spill metrics and do cleanup work when task is finished.
-    context.taskMetrics().memoryBytesSpilled += memoryBytesSpilled
-    context.taskMetrics().diskBytesSpilled += diskBytesSpilled
+    context.taskMetrics().incMemoryBytesSpilled(memoryBytesSpilled)
+    context.taskMetrics().incDiskBytesSpilled(diskBytesSpilled)
 
     def releaseFinalShuffleMemory(): Unit = {
       inMemoryBlocks.foreach { block =>

core/src/test/scala/org/apache/spark/rdd/RDDSuite.scala

@@ -23,9 +23,8 @@ import scala.collection.mutable.{ArrayBuffer, HashMap}
 import scala.collection.JavaConverters._
 import scala.reflect.ClassTag
 
-import org.scalatest.FunSuite
-
 import com.esotericsoftware.kryo.KryoException
+import org.scalatest.FunSuite
 
 import org.apache.spark._
 import org.apache.spark.api.java.{JavaRDD, JavaSparkContext}