libmediaplayerservice: be careful what you include
cause it just might cause *bugs* which will take you a long time to find and fix

Change-Id: Ie774813858b2f9a6afc1165bddd0351ff153975d
Merge remote-tracking branch 'omni/android-4.4' into android-4.4