Fix derp from big update
Fix omam4xxx revision that broke tuna
track local system/vold
sync with four threads for compatibility
TMobile theme engine forked from Cyanogenmod
Merge https://github.com/codefireXperiment/android_manifest into jb-devel-release-i9505

Conflicts:
	default.xml