Strict Aliasing Fix

Conflicts:
	vm/Android.mk