Merge "Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into kitkat-cts-dev am: 4e3a5a53c5" into lollipop-cts-dev am: e3ff49ef40" into lollipop-mr1-cts-dev