Merge "Revert "Add new test type to StagefrightTest"" into oc-dev am: 8aad05affd
am: 74246140aa

Change-Id: I3eb7d314ff9a9d03e31a239904cb5c6dc28aade0