Squash 4.3 changes.

Conflicts:
	adb/Android.mk
	adb/adb.c
	adb/usb_vendors.c
	charger/Android.mk
	charger/charger.c
	debuggerd/debuggerd.c
	debuggerd/tombstone.c
	fs_mgr/fs_mgr.c
	include/private/android_filesystem_config.h
	include/system/audio.h
	include/sysutils/FrameworkListener.h
	init/devices.c
	init/init.c
	init/property_service.c
	liblog/logd_write.c
	libusbhost/usbhost.c
	mkbootimg/mkbootimg.c
	rootdir/etc/init.goldfish.rc
	rootdir/init.rc
	toolbox/Android.mk
	toolbox/df.c

Change-Id: I04e4322da61c2a9b23ddb2ff75004ebf46212c6f

Conflicts:

	fs_mgr/fs_mgr.c
	fs_mgr/fs_mgr_priv.h
	fs_mgr/include/fs_mgr.h
	init/builtins.c
	init/init.c
	init/util.c
	rootdir/init.rc
	run-as/package.c