Merge "Backport MediaCodec-based test to StagefrighTest" into mnc-dev