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

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