Roll external/skia c1a2ea33a..88f5671f7 (2 commits)

https://skia.googlesource.com/skia.git/+log/c1a2ea33a..88f5671f7

2019-02-07 reed@google.com move SkMetaData into src
2019-02-06 bungeman@google.com Add BOT/EOT to Shaper.

The AutoRoll server is located here: https://autoroll-internal.skia.org/r/android-master-autoroll

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+/master/autoroll/README.md

If the roll is causing failures, please contact the current sheriff, who should
be CC'd on the roll, and stop the roller if necessary.

Test: Presubmit checks will test this change.
Change-Id: Iffb088c5fc8fb78fd769aa51d4e1da1289c442aa
Exempt-From-Owner-Approval: The autoroll bot does not require owner approval.
diff --git a/Android.bp b/Android.bp
index 77fee85..915a44d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -218,7 +218,6 @@
         "src/core/SkMatrix.cpp",
         "src/core/SkMatrix44.cpp",
         "src/core/SkMatrixImageFilter.cpp",
-        "src/core/SkMetaData.cpp",
         "src/core/SkMiniRecorder.cpp",
         "src/core/SkMipMap.cpp",
         "src/core/SkModeColorFilter.cpp",
@@ -463,6 +462,7 @@
         "src/utils/SkJSON.cpp",
         "src/utils/SkJSONWriter.cpp",
         "src/utils/SkMatrix22.cpp",
+        "src/utils/SkMetaData.cpp",
         "src/utils/SkMultiPictureDocument.cpp",
         "src/utils/SkNWayCanvas.cpp",
         "src/utils/SkNullCanvas.cpp",