am fc52dd88: Merge "Revert "Merge "Improve AudioPlayer position reporting""" into jb-dev

* commit 'fc52dd88e4d2f433feba5d5aaff1880659d46319':
  Revert "Merge "Improve AudioPlayer position reporting""