libangle: build with -fno-strict-aliasing && conflicts resolved in 'e…  …xternal/webkit/Android.mk

Change-Id: Ic2e3f54799c07868ca44b2b0e900660cc4982970
Signed-off-by: Evan McClain <aeroevan@gmail.com>

Conflicts:
	Android.mk

Conflicts:
	Android.mk

Conflicts:
	Android.mk

Conflicts:
	Android.mk