Bump version to 6.0.3.1

Change-Id: I01f94f18e240bf9580f118c6cb30ad702fb37e80
Reverse kang Wil Wheaton Recovery enhancements.

Change-Id: Ia9eace0ff0826801515b335ac6543c1271948612
6032

Change-Id: Ieb03cb1b06e3a9a2eaab61ac3d6c2e02922cea4c
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_bootable_recovery into cm-10.1-v6.0

Conflicts:
	Android.mk