Merge "Merge "Merge "Revert "DO NOT MERGE StagefrightTest: add test for bug 23270724"" into nougat-cts-dev am: 43d087a2d9  -s ours" into nougat-mr1-cts-dev am: d768b00f89  -s ours" into oreo-cts-dev