Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev