Merge tag 'android-4.3_r2.1' of https://android.googlesource.com/platform/system/core into sm-jb-mr2

Android 4.3 release 2.1

Signed-off-by: Paul Beeler <sparksco@gmail.com>

Conflicts:
	adb/Android.mk
	fs_mgr/fs_mgr.c
	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
	toolbox/Android.mk