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

Merge commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f' into gingerbread-plus-aosp

* commit '959909ef2855b119a9e8cd171dd0ebeb606b3a8f':
  Support multiple PPS and SPS in avcC box
tree: e86fadbf5e4c4ffacd12369ccd4b42874ffa69db
  1. camera/
  2. cmds/
  3. include/
  4. media/
  5. services/