Strict Aliasing Violations CCCCCCCCCOMBO BREAKER!

Conflicts:
	media/libmediaplayerservice/Android.mk

Change-Id: I2678c9fd2ebd241f6c0f98634d6a24b5aa104aa0