Merge branch 'cm/next-wip'

Signed-off-by: ayysir <dresadd09691@gmail.com>

Conflicts:
	include/hardware/audio.h
	include/hardware/gralloc.h
	include/hardware/hwcomposer_defs.h
	include/hardware/power.h
	modules/audio/audio_hw.c