Revert "Add EXTRA_STREAM_TYPE"

This reverts commit 81dc63dae3e3f0a53f77efa3c06f5029a2f25db9.

Change-Id: Id88a383fe467582a9aa0f740259d89e916beb5c3
2 files changed