Merge "MediaPlayer: use mLock to prevent racing condition." am: 01a9f04
am: 28ece4d

* commit '28ece4d89bcbf34785d909e8f62a486080d0315d':
  MediaPlayer: use mLock to prevent racing condition.