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

Change-Id: Ieb5565b41d620a38e946a7c76f2838f0894dfc83