Strict Aliasing Fix

Conflicts:
	Android.mk
	cpp/Android.mk