Merge "Merge "Merge "Backport MediaCodec-based test to StagefrighTest" into kitkat-cts-dev am: 4e3a5a53c5 am: 6d666f5e14 am: edf682a6e3" into marshmallow-cts-dev am: 5369516c42" into nougat-cts-dev