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

gm/lightingshader.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkLightingShader.h"
 #include "SkNormalSource.h"
@@ skipping 34 matching lines @@
 public:
     LightingShaderGM() {
         this->setBGColor(sk_tool_utils::color_to_565(0xFFCCCCCC));
 
         SkLights::Builder builder;
 
         builder.add(SkLights::Light::MakeDirectional(SkColor3f::Make(1.0f, 1.0f, 1.0f),
                                                      SkVector3::Make(SK_ScalarRoot2Over2,
                                                                      0.0f,
                                                                      SK_ScalarRoot2Over2)));
-        builder.setAmbientLightColor(SkColor3f::Make(0.2f, 0.2f, 0.2f));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.2f, 0.2f, 0.2f)));
 
         fLights = builder.finish();
     }
 
 protected:
     enum NormalMap {
         kHemi_NormalMap,
         kFrustum_NormalMap,
         kTetra_NormalMap,
 
@@ skipping 106 matching lines @@
 
     sk_sp<SkLights> fLights;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return new LightingShaderGM;)
 }