Hls merge with updated google

There have been some updates to the ExoPlayer on google's github tree. I have gone ahead and merged those changes into the raw hls branch (as part of my own effort to add ID3 tag support for HLS streams which can be contributed next). After these changes are merged the master branch of this tree could be updated to the latest from Google.