SQUASHED: 4.8 Fix

Conflicts:
	media/libmediaplayerservice/Android.mk

Change-Id: I0baea10619e529b5a5a463fcaf448b6d718098e1