Strict Aliasing Fix

Conflicts:
	Android.mk
	cpp/Android.mk

Change-Id: I041aa2efca60329a601eef4cfd3827927e1250e6