Revert "VeNum optimizations"

This reverts commit b10e8aaf4fb412e1294fd0b08a29744d927786a0.

Conflicts:
	Android.mk