Merge with cm-11.0

Conflicts:
	hal/Android.mk
	hal/audio_extn/audio_extn.c
	hal/audio_extn/audio_extn.h
	hal/audio_extn/hfp.c
	hal/audio_extn/listen.c
	hal/audio_hw.c
	hal/audio_hw.h
	hal/msm8974/platform.c
	hal/msm8974/platform.h
	hal/voice.c
	hal/voice_extn/voice_extn.c
	hal_mpq/Android.mk
	hal_mpq/audio_bitstream_sm.c
	hal_mpq/audio_hw.h
	hal_mpq/audio_stream_out.c
	hal_mpq/mpq8092/hw_info.c
	hal_mpq/mpq8092/platform.c
	hal_mpq/mpq8092/platform.h
	hal_mpq/platform_api.h
	post_proc/bass_boost.c
	post_proc/equalizer.c
	post_proc/reverb.c
	post_proc/virtualizer.c

Change-Id: I764081f9343d8e895d5267f4f38452c8d0fc8e08