Merge "CTS secondary_user: CtsMediaBitstreamsTestCases" am: ff606b5168 am: db7d6b4320 am: 1243c03bcd

Change-Id: Iff394d568fa1c759e77630b04292d6ed04982308