Merge remote-tracking branch 'googaosp/kitkat-release' into HEAD

Conflicts:
	adb/usb_vendors.c
	fs_mgr/include/fs_mgr.h
	include/private/android_filesystem_config.h
	include/system/audio.h
	init/devices.c
	init/init.c
	init/property_service.c
	libcorkscrew/arch-x86/backtrace-x86.c
	liblog/logd_write.c
	libusbhost/usbhost.c
	rootdir/Android.mk
	rootdir/init.rc
	sdcard/Android.mk
	toolbox/watchprops.c

Change-Id: Ib0060fd5d63d9cbc0b36d6982c8aad5f30692642