Merge remote-tracking branch 'comoyo/master' into h261-performance

Conflicts:
	media/webrtc/trunk/webrtc/build/common.gypi
	media/webrtc/trunk/webrtc/modules/audio_device/android/opensles_common.h
	media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing.gypi
	media/webrtc/trunk/webrtc/modules/audio_processing/audio_processing_impl.cc
	media/webrtc/trunk/webrtc/modules/audio_processing/splitting_filter.cc
	media/webrtc/trunk/webrtc/modules/video_coding/main/source/video_coding.gypi
	media/webrtc/trunk/webrtc/voice_engine/transmit_mixer.cc
	tools/profiler/GeckoProfilerImpl.h