Merge "MediaPlayer: persistent track indices" into mnc-dev