Merge "Fix race condition in IMediaSource" into rvc-dev am: 789d4e903e am: 0db1308372 am: e625fb6735 am: 4b55cb9032

Change-Id: I397de23100290c309f7038b13b3ec09f674986d4