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

Change-Id: I1e64b58cc09fdc7e9a9cb4be1625d71c8c210432