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

Change-Id: Idb5ad84eafb707b0530c56b9bf807e0eef8148d9