Merge tag 'android-4.3_r2.1' into cm-10.2

Android 4.3 release 2.1

Conflicts:
	Android.mk
	Ext4.cpp
	Ext4.h
	VolumeManager.cpp

Change-Id: I1d6222502cc35f8ded9480396ea5a10df6ac0ac9