Merge "Backport MediaCodec-based test to StagefrighTest am: 576904fc52" into lollipop-cts-dev