Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into lollipop-mr1-cts-dev am: 92b7b8ec7f am: 5c1cf50a00 am: 6385414839" into nougat-mr1-cts-dev
am: 1e5d950636

Change-Id: I2fbf50cfaff8cc380792a61898f9fabc56d878bc