Squashed multiple commits

Conflicts:
	hal/audio_extn/usb.c
	hal/msm8974/platform.c

Conflicts:
	hal/audio_extn/usb.c
	hal/msm8974/platform.c