Merge "To make SniffMP3() more concrete so that we can remove false-positve responses from MPEG-PS streams."