Merge from Chromium at DEPS revision r220549

This commit was generated by merge_to_master.py.

Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
diff --git a/skia/skia_chrome.target.darwin-arm.mk b/skia/skia_chrome.target.darwin-arm.mk
index 12da9d6..3886a97 100644
--- a/skia/skia_chrome.target.darwin-arm.mk
+++ b/skia/skia_chrome.target.darwin-arm.mk
@@ -36,11 +36,13 @@
 	skia/ext/image_operations.cc \
 	skia/ext/lazy_pixel_ref.cc \
 	skia/ext/lazy_pixel_ref_utils.cc \
+	skia/ext/opacity_draw_filter.cc \
 	skia/ext/paint_simplifier.cc \
 	skia/ext/platform_canvas.cc \
 	skia/ext/platform_device.cc \
 	skia/ext/platform_device_linux.cc \
 	skia/ext/recursive_gaussian_convolution.cc \
+	skia/ext/SkDiscardableMemory_chrome.cc \
 	skia/ext/skia_utils_base.cc \
 	skia/ext/vector_canvas.cc