Strict Aliasing Violations CCCCCCCCCOMBO BREAKER!

Conflicts:
	camera/Android.mk
	media/libmedia/Android.mk
	media/libmediaplayerservice/Android.mk
	media/libstagefright/Android.mk
	media/mediaserver/Android.mk
	services/audioflinger/Android.mk
Merge branch 'linaro' of github.com:ModdedPA/android_frameworks_av into linaro
conflict fix