remove includes for duplicate functions

unit_test/scale_argb_test.cc

 /*
  *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS. All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #include <stdlib.h>
 #include <time.h>
 
-#include "libyuv/convert.h"
+#include "libyuv/convert_argb.h"
 #include "libyuv/cpu_id.h"
-#include "libyuv/row.h"
+#include "libyuv/row.h"   // For align_buffer_64
 #include "libyuv/scale_argb.h"
 #include "libyuv/video_common.h"
 #include "../unit_test/unit_test.h"
 
 namespace libyuv {
 
 #define STRINGIZE(line) #line
 #define FILELINESTR(file, line) file ":" STRINGIZE(line)
 
 // Test scaling with C vs Opt and return maximum pixel difference. 0 = exact.
@@ skipping 428 matching lines @@
                                  benchmark_height_ * 3 / 2,
                                  benchmark_width_, benchmark_height_,
                                  libyuv::kFilterBilinear,
                                  benchmark_iterations_,
                                  disable_cpu_flags_, benchmark_cpu_info_);
   EXPECT_LE(diff, 10);
 }
 
 
 }  // namespace libyuv