am 49ea1337: Merge changes I787e1c05,I72d3a5e1,I0a5cc65f,I75fc2a25,I2c2be08d, .....

* commit '49ea13379fb15ddb73183ebafa3a377342ef932f':
  LiveSession: Use the actual, possibly redirected url as base in the M3U
  M3UParser: Skip query strings when looking for the last slash in a URL
  ChromiumHTTPDataSource: Keep track of the redirected URL
  Initial HLS seamless switch implementation.
  NuPlayer side support for seamless format switch.
  LiveSession refactor
  PlaylistFetcher: Add support for block-by-block decryption.
  LiveSession: Add support for block-by-block fetchFile.

diff --cc media/libmediaplayerservice/nuplayer/NuPlayer.cpp
Simple merge

diff --cc media/libstagefright/httplive/LiveSession.cpp
Simple merge

diff --cc media/libstagefright/httplive/M3UParser.cpp
Simple merge