strict aliasing fix

Conflicts:
	vm/Android.mk