Merge "Add updatable_media_stub to framework"
am: 63bf3e4d98

Change-Id: Ie810db1c2a5906946318f925d7d478b73b4cd651