Merge change 8779

* changes:
  Fix issue 2015322	mediaframeworktest.MediaAudioTrackTest fails.