Merge "Revert "CtsMediaBitstreamsTestCases: bitstreams package via annotation"" into oc-dev am: d7317b21af
am: 6c7df20e2e

Change-Id: I0e41511afbb1eb960389c2b0ee577411e4e9fad1