Merge "Always assign a free ID to the new MediaPlayer"
am: 8ef0c70870

Change-Id: Idde77ceb6e29ccd5fe8f9d1d35d27fceba557178