Merge tag 'android-4.3_r2.1' into HEAD

Android 4.3 release 2.1

# gpg: Signature made Tue 23 Jul 2013 06:33:17 PM EDT using DSA key ID 9AB10E78
# gpg: Can't check signature: No public key

Conflicts:
	full_grouper.mk
	vold.fstab