Merge remote-tracking branch 'cm/cm-10.2' into jb43

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

Change-Id: Ifff63fc21ac01f85b0c2e79e231fef0722f68beb