asound.conf: update to fix notification lag

When a notification appears and the device vibrates and plays sound
simultaneously, mediaserver crashes and causes a delay in playing
the sound.

Change-Id: Id0c2c291684342f450cbd542bd2afdc436828247
Merge "asound.conf: update to fix notification lag" into cm-11.0
Merge remote-tracking branch 'cm/cm-11.0' into kk-cm
fix torch
X3: 1.Add electron beam animation on screen off
2.Switch to telephony.mk
3.Add cache target for NEON optimization
4.Improve i/o performance

Conflicts:
	mm.mk
	overlay/frameworks/base/core/res/res/values/config.xml
X3RIL: override setCellInfoListRate

- Based on http://review.cyanogenmod.org/#/c/54960/
- XDA users reported a better deep sleep with this patch
Merge Battery Health Hal
Fix ext_sdcard missing service fuse