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