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

Change-Id: Iabfea036b7d981f92a949bddc402baced00f7321