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

Change-Id: Id6b63a3f7b214cb5da9bdeb08451c59a0779ae4f