Merge stage-aosp-master into pi-dev-plus-aosp
am: c9dbef9150

Change-Id: I9be366c1862160b304d5be0eafc2ae00d6e64957
diff --git a/Android.mk b/Android.mk
index b57c297..d693b7d 100644
--- a/Android.mk
+++ b/Android.mk
@@ -32,7 +32,8 @@
     okhttp \
     services \
     services.accessibility \
-    telephony-common
+    telephony-common \
+    updatable-media
 
 # include the uncompiled/raw resources in the jar
 # Eventually these raw resources will be removed once the transition to