Merge "Add new test type to StagefrightTest" into nyc-dev am: 93b2870a31 am: e613c6c4f5
am: 2ea0e5cc99

Change-Id: I10fb2c8387ee8027ee1e5621e935d6884225249f