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

Change-Id: Ib487492ebb0aca7f586fcf9ced75ed41bb9144c3