Merge "Backport MediaCodec-based test to StagefrighTest" into mnc-dev am: 8a253f9a92 am: 2d89a4c646
am: 6369e9de5b

Change-Id: I820b3b0dd7e3ee373ca2152eb2b3505212440ea5