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

Change-Id: Ie22e30eee7b8b189541a0917e7fecedf7b7873a0