Merge "Backport MediaCodec-based test to StagefrighTest" into lollipop-mr1-cts-dev