Merge "HTTPLIVE: do not store hash of malformed M3U8 file" am: e8b14c3c5c am: f1d93381be am: ab438ff052
am: 53607243f1

Change-Id: I579928687f836ebbb0097d205d26c08a28904a8e