refactoring

Signed-off-by: Evan Anderson <evan1124@gmail.com>
Merge tag 'android-4.3_r2.1' into jellybean

Android 4.3 release 2.1

Signed-off-by: Evan Anderson <evan1124@gmail.com>

Conflicts:
	BoardConfigCommon.mk
	fstab.grouper
	init.grouper.rc
	recovery.fstab
	vold.fstab