Merge "apex: The media swcodec breaks when its dependency is changed"