Merge "Add updatable_media_stub to framework" am: f3273c5587 am: 833f84dff8

Change-Id: I88924f2c59438e7dce3b2ebc9fbdc3186f046732