Merge 'android-4.3_r2.1' into jb-mr2

Android 4.3 release 2.1

Conflicts:
	include/private/android_filesystem_config.h
	include/system/audio.h
	include/sysutils/FrameworkListener.h
	init/init.c
	liblog/logd_write.c
	libnetutils/dhcp_utils.c
	mkbootimg/mkbootimg.c
	rootdir/init.rc
	toolbox/Android.mk
	toolbox/df.c

Change-Id: I9674ae8b821638eb1c97899e69bb462bb439bb1b

Conflicts:
	adb/Android.mk
	include/private/android_filesystem_config.h
	init/builtins.c
	init/init.c
	init/util.c
	rootdir/etc/init.goldfish.rc
	rootdir/init.rc
	run-as/package.c