Merge "Add drawImageLattice() and drawBitmapLattice() APIs" into master-skia

https://skia.googlesource.com/skia/+/c573a40ed5024b463e47088d307e3164a486dba5

Change-Id: I631d87409bbed63283c6204eb39152c3c109eb39
diff --git a/bench/Android.mk b/bench/Android.mk
index 098dc5b..ee5af84 100644
--- a/bench/Android.mk
+++ b/bench/Android.mk
@@ -54,6 +54,7 @@
 	DashBench.cpp \
 	DisplacementBench.cpp \
 	DrawBitmapAABench.cpp \
+	DrawLatticeBench.cpp \
 	EncoderBench.cpp \
 	FSRectBench.cpp \
 	FontCacheBench.cpp \
@@ -292,6 +293,7 @@
 	../gm/internal_links.cpp \
 	../gm/inversepaths.cpp \
 	../gm/largeglyphblur.cpp \
+	../gm/lattice.cpp \
 	../gm/lcdblendmodes.cpp \
 	../gm/lcdoverlap.cpp \
 	../gm/lcdtext.cpp \