Merge "Add updatable-media jarjar rules to framework-all" into rvc-dev