Revert of Fix for "Android audio playout doesn't support non-call media stream"

Revert of Fix for "Android audio playout doesn't support non-call media stream" (patchset #3 id:40001 of https://codereview.webrtc.org/1419693004/ )

Reason for revert:
Causes issues on some phones, e.g. Sony mobiles.
See b/25385046 for details.

Original issue's description:
> Fix for "Android audio playout doesn't support non-call media stream"
>
> BUG=webrtc:4767
> R=magjed@webrtc.org
>
> Committed: https://crrev.com/6408174cdc4040528dd87ff7e5c76be91cdbafbe
> Cr-Commit-Position: refs/heads/master@{#10435}

TBR=magjed@webrtc.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=webrtc:4767
Committed: https://crrev.com/1ba936a807b12d887b7985317e4205b80f1120b2
Cr-Commit-Position: refs/heads/master@{#10492}

[henrika_webrtc, 2015-11-03 12:27:43]

Created Revert of Fix for "Android audio playout doesn't support non-call media
stream"

[commit-bot: I haz the power, 2015-11-03 12:27:49]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1415603008/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1415603008/1

[commit-bot: I haz the power, 2015-11-03 12:28:03]

Committed patchset #1 (id:1)

[commit-bot: I haz the power, 2015-11-03 12:28:13]

Patchset 1 (id:??) landed as
https://crrev.com/1ba936a807b12d887b7985317e4205b80f1120b2
Cr-Commit-Position: refs/heads/master@{#10492}