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

Change-Id: I1e345f9d2625c421d854cb29a38a225845cb7313