Merge remote-tracking branch 'cm/cm-10.2' into your face

Conflicts:
	adb/Android.mk
	debuggerd/crasher.c
	debuggerd/tombstone.c
	include/cutils/atomic-arm.h
	include/private/android_filesystem_config.h
	include/system/audio.h
	include/system/camera.h
	include/system/graphics.h
	init/devices.c
	init/init.c
	libcorkscrew/arch-x86/backtrace-x86.c
	liblog/logd_write.c
	libnetutils/ifc_utils.c
	libsysutils/src/SocketClient.cpp
	libusbhost/usbhost.c
	rootdir/init.rc
	toolbox/Android.mk
	toolbox/df.c

Change-Id: I2ae158abbd377af6e4716770df1b86c6e39a24f0