Merge "Remove updatable from mediaserver and mediaextractor" am: 207ff86dce
am: 6e046089ac

Change-Id: I816d705703387322410d96a673c94b15287b58af