Merge "Add updatable_media_stub to framework" am: 63bf3e4d98 am: d1dfebd9aa

Change-Id: Ie9533f6663326629219666b3216e41ca3bdf1212