Merge \"HLS: allow audio/subtitles to appear after bitrate variants\" into nyc-dev
am: 37a9de26f6

Change-Id: Idb61d08e5b880dd6c788df71b86f5db0a52bb05d