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

Change-Id: I3b3df1d18d93f2114b1a02ad6ca35d62a0ac2999