am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1

* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.