Merge "Relocate ResourceManager aidls to mediaresourcemanager"