Change back so that Android ApprtcDemo only use one MediaStream containing both audio and video.
The reason is that the desktop apprtcdemo only handle one MediaStream and this doesn't play audio if it receive two streams.

TEST=Test that a call with audio and video can be setup between an Android device and a desktop client using apprtc.appspot.com.
BUG=4051,3786
R=henrika@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/31069004

git-svn-id: http://webrtc.googlecode.com/svn@7781 4adac7df-926f-26a2-2b94-8c16560cd09d
Clear 2 unused functions in audio processing aecm module.

unused functions:
WebRtcAecm_WindowAndFFTNeon
WebRtcAecm_InverseFFTAndWindowNeon

BUG=3580
R=andrew@webrtc.org

Change-Id: I12c50a8706d40f9ea98208b5733c00ede7b1f435

Review URL: https://webrtc-codereview.appspot.com/30269004

Patch from Zhongwei Yao <zhongwei.yao@arm.com>.

git-svn-id: http://webrtc.googlecode.com/svn@7782 4adac7df-926f-26a2-2b94-8c16560cd09d
Remove -flax-vector-conversions flag for ARM NEON building.

Pass compilation on both ARMv7 and ARM64. The generated
binary (audioproc) is byte to byte (with symbol striped) same as
before. The output of audioproc -aecm is also byte to byte same between
C and NEON version on ARMv7 and ARM64.

Change-Id: Ibdf40fe085f6bad1311f59bf9318bbcf37dd7ce5

BUG=3850
R=andrew@webrtc.org, jridges@masque.com

Review URL: https://webrtc-codereview.appspot.com/30239004

Patch from Zhongwei Yao <zhongwei.yao@arm.com>.

git-svn-id: http://webrtc.googlecode.com/svn@7783 4adac7df-926f-26a2-2b94-8c16560cd09d
Merge 7580 "Build fix for MIPS32R6."

> Build fix for MIPS32R6.
> 
> Exclude MIPS optimizations for MIPS32R6 build since some of the instructions
> are not supported. This is temporary fix, until the MIPS32R6 code is added.
> 
> R=andrew@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/25989004
> 
> Patch from Ljubomir Papuga <lpapuga@mips.com>.

TBR=lpapuga@mips.com
BUG=chromium:438351

Review URL: https://webrtc-codereview.appspot.com/31079004

git-svn-id: http://webrtc.googlecode.com/svn@7784 4adac7df-926f-26a2-2b94-8c16560cd09d