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

samplecode/SampleBevel.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SampleCode.h"
 #include "SkCanvas.h"
 #include "SkLightingShader.h"
@@ skipping 731 matching lines @@
         fControlPanel.drawContent(canvas);
         canvas->restore();
 
         SkLights::Builder builder;
         for (int i = 0; i < kNumLights; i++) {
             builder.add(SkLights::Light::MakeDirectional(fLightDefs[i].fColor,
                                                          SkPoint3::Make(fLightDefs[i].fDirXY.fX,
                                                                         fLightDefs[i].fDirXY.fY,
                                                                         fLightDefs[i].fDirZ)));
         }
-        builder.setAmbientLightColor(SkColor3f::Make(0.4f, 0.4f, 0.4f));
+        builder.add(SkLights::Light::MakeAmbient(SkColor3f::Make(0.4f, 0.4f, 0.4f)));
         fLights = builder.finish();
 
         // Draw shapes
         SkScalar xPos = kCtrlRange + 25.0f;
         SkScalar yPos = fShapeBounds.height();
         for (Shape shape : { kCircle_Shape, kRect_Shape }) {
             canvas->save();
             canvas->translate(xPos, yPos);
             this->drawShape(shape, canvas);
             canvas->restore();
@@ skipping 61 matching lines @@
     sk_sp<SkTypeface> fLabelTypeface;
 
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new BevelView; }
 static SkViewRegister reg(MyFactory);