This reverts commit ea780b689f8ee3dff355deab2434bbd4ae04d208. Conflicts: media/libmediaplayerservice/Android.mk