Merge "Backport MediaCodec-based test to StagefrighTest" into kitkat-cts-dev am: 4e3a5a53c5 am: 6d666f5e14
am: edf682a6e3

Change-Id: Ia414b33f5a1eb7595da65b2dcae98b8c408c2def