Merge "revert "HLS seeking: call readAt() on new thread"" am: 00a4170c0c
am: a97abe701c

Change-Id: I4266221c9d5ebca4b5c4cb6c05a371e9ae01cf16