Merge "Merge "DO NOT MERGE: StagefrightTest: add test for bug 32577290" into marshmallow-cts-dev am: 3170da8801  -s ours" into nougat-cts-dev