Merge "Backport MediaCodec-based test to StagefrighTest" into lollipop-mr1-cts-dev
am: 92b7b8ec7f

Change-Id: I9f0a734186d1e786532bedcf98692d143aacbca6