Merge "MediaPlayer: use mLock to prevent racing condition." into nyc-dev
am: 2c96c0e

* commit '2c96c0e35c7600c1112baa2cbebdf52f477c8880':
  MediaPlayer: use mLock to prevent racing condition.