am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte...

am 7b2ed5d7: Merge "Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data \'avcC\' accordingly." into gingerbread

Merge commit '7b2ed5d7' into gingerbread-plus-aosp

* commit '7b2ed5d7':
  Depending on our preference to write 2-byte or 4-byte NALs, patch the codec specific data 'avcC' accordingly.