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

Change-Id: I5356d5635752da90bd101a64c958e8355bac6816