Merge "Merge "Merge "Merge "Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into kitkat-cts-dev am: 4e3a5a53c5" into lollipop-cts-dev am: e3ff49ef40 am: c4efec6783" into marshmallow-cts-dev am: a19a9914c3" into nougat-cts-dev am: d22cc9d704" into nougat-mr1-cts-dev am: 7c88e2f53b"