Merge "media bitstreams test: split into classes based on path prefix" into oc-dev