am fa4f57fe: am 959909ef: Merge "Support multiple PPS and SPS in avcC box" into gingerbread

Merge commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e'

* commit 'fa4f57fe0f85d2340524311f1409e0a1b2864a6e':
  Support multiple PPS and SPS in avcC box