am c7342fbf: Merge "In order to recover from video lagging behind audio, drop avc frames"

* commit 'c7342fbf992091cd37bb34b8fac2e6b6ca47fdf5':
  In order to recover from video lagging behind audio, drop avc frames