am 85a5b99f: am 6641004b: Merge "Revert "mediaplayer: make frame-accurate avsync configurable"" into lmp-mr1-dev

* commit '85a5b99f990a5498de5a29dce218d8c3e2d91c19':
  Revert "mediaplayer: make frame-accurate avsync configurable"