am dffe4621: Merge "DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""" into lmp-dev

* commit 'dffe4621893c29371cfcf42a5afc9c0979a4f1fa':
  DO NOT MERGE - Revert "Revert "Fix AudioTrackTest.testGetTimestamp""