Merge "Merge "StagefrightTest: add test for bug 32577290" into nougat-mr1-cts-dev am: e768ca99c1  -s ours"