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