Merge "Rewrite mediaserver socket rule using macro."