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

Change-Id: Iba352fd4dd6d34b5bff5e78d2d9e3c7548dea89a