Merge "Support multiple PPS and SPS in avcC box" into gingerbread