Merge "A bit of misc cleanup." into master-skia

https://skia.googlesource.com/skia/+/9a106ba2dd68ced8f6556e99ba211a37439a03bb

Change-Id: I32f6573edc60f34842b66e007df0fc7625459e4e
diff --git a/bench/Android.mk b/bench/Android.mk
index 0f28247..0f23b33 100644
--- a/bench/Android.mk
+++ b/bench/Android.mk
@@ -132,6 +132,7 @@
 	../gm/all_bitmap_configs.cpp \
 	../gm/alphagradients.cpp \
 	../gm/anisotropic.cpp \
+	../gm/annotated_text.cpp \
 	../gm/arcofzorro.cpp \
 	../gm/arithmode.cpp \
 	../gm/astcbitmap.cpp \