Merge "place mediametricsservice headers in a subdirectory"