Merge "Merge "Merge "Merge "Revert "DO NOT MERGE StagefrightTest: add test for bug 23270724"" into marshmallow-cts-dev am: 6bc2fe3818  -s ours" into nougat-cts-dev am: ecaf21f39a  -s ours" into nougat-mr1-cts-dev am: d2b8adcb5d  -s ours" into oreo-cts-dev