SQUASHED: 4.8 Fix

Conflicts:
	media/libmediaplayerservice/Android.mk

Change-Id: Ibb2e3fcebb570455002e7cf04661f359459fc671