Revert of Moved ambient lights out of SkLight's light array

tests/SerializationTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Resources.h"
 #include "SkAnnotationKeys.h"
 #include "SkCanvas.h"
@@ skipping 540 matching lines @@
     TestPictureTypefaceSerialization(reporter);
 
     // Test SkLightingShader/NormalMapSource serialization
     {
         const int kTexSize = 2;
 
         SkLights::Builder builder;
 
         builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f),
                                                      SkVector3::Make(1.0f, 0.0f, 0.0f)));
-        builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
 
         sk_sp<SkLights> fLights = builder.finish();
 
         SkBitmap diffuse = sk_tool_utils::create_checkerboard_bitmap(
                 kTexSize, kTexSize,
                 sk_tool_utils::color_to_565(0x0),
                 sk_tool_utils::color_to_565(0xFF804020),
                 8);
 
         SkRect bitmapBounds = SkRect::MakeIWH(diffuse.width(), diffuse.height());
@@ skipping 121 matching lines @@
         { r1, SkAnnotationKeys::Define_Named_Dest_Key(),    std::move(d1) },
         { r2, SkAnnotationKeys::Link_Named_Dest_Key(),      std::move(d2) },
     };
 
     sk_sp<SkPicture> pict0(recorder.finishRecordingAsPicture());
     sk_sp<SkPicture> pict1(copy_picture_via_serialization(pict0.get()));
 
     TestAnnotationCanvas canvas(reporter, recs, SK_ARRAY_COUNT(recs));
     canvas.drawPicture(pict1);
 }