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

Change-Id: Ib3e190deeb1cdae97d167f61b44aa9d17bcc36c4