Merge "MediaPlayer: sanity check track before dereferencing" into pi-dev
am: 1ba53717fe

Change-Id: I274167165065a24e49c2b899b33623ffd298b8fa