Strict Aliasing Violations CCCCCCCCCOMBO BREAKER!

Conflicts:
	media/libeffects/visualizer/EffectVisualizer.cpp
	media/libmedia/Visualizer.cpp
	media/libmediaplayerservice/Android.mk
	media/libnbaio/Android.mk
	media/libstagefright/Android.mk
	services/audioflinger/Android.mk

	modified:   camera/Android.mk
	modified:   cmds/stagefright/Android.mk
	modified:   cmds/stagefright/SineSource.h
	modified:   drm/common/Android.mk
	modified:   drm/drmserver/Android.mk
	modified:   drm/libdrmframework/Android.mk
	modified:   drm/mediadrm/plugins/mock/Android.mk
	modified:   include/media/ToneGenerator.h
	modified:   libvideoeditor/Android.mk
	modified:   libvideoeditor/lvpp/Android.mk
	modified:   libvideoeditor/osal/Android.mk
	modified:   libvideoeditor/osal/src/Android.mk
	modified:   libvideoeditor/vss/3gpwriter/Android.mk
	modified:   libvideoeditor/vss/3gpwriter/src/Android.mk
	modified:   libvideoeditor/vss/Android.mk
	modified:   libvideoeditor/vss/mcs/Android.mk
	modified:   libvideoeditor/vss/mcs/src/Android.mk
	modified:   libvideoeditor/vss/src/Android.mk
	modified:   libvideoeditor/vss/stagefrightshells/Android.mk
	modified:   libvideoeditor/vss/stagefrightshells/src/Android.mk
	modified:   libvideoeditor/vss/video_filters/Android.mk
	modified:   libvideoeditor/vss/video_filters/src/Android.mk
	modified:   media/common_time/Android.mk
	modified:   media/libeffects/downmix/Android.mk
	modified:   media/libeffects/downmix/EffectDownmix.c
	modified:   media/libeffects/factory/Android.mk
	modified:   media/libeffects/lvm/lib/Android.mk
	modified:   media/libeffects/lvm/wrapper/Android.mk
	modified:   media/libeffects/preprocessing/Android.mk
	modified:   media/libeffects/testlibs/Android.mk_
	modified:   media/libeffects/visualizer/Android.mk
	modified:   media/libeffects/visualizer/EffectVisualizer.cpp
	modified:   media/libmedia/Android.mk
	modified:   media/libmedia/Visualizer.cpp
	modified:   media/libmediaplayerservice/Android.mk
	modified:   media/libmediaplayerservice/MediaPlayerFactory.cpp
	modified:   media/libnbaio/Android.mk
	modified:   media/libstagefright/Android.mk
	modified:   media/libstagefright/OMXCodec.cpp
	modified:   media/mediaserver/Android.mk
	modified:   media/mtp/Android.mk
	modified:   services/audioflinger/Android.mk
	modified:   services/audioflinger/AudioResampler.h
	modified:   services/camera/libcameraservice/Android.mk
	modified:   services/medialog/Android.mk
	modified:   tools/resampler_tools/Android.mk

Change-Id: I86a071fa8b2b6c62c50874b3145121c214ec2554