am 7013209c: Merge "Handle large AVCC chunks"

* commit '7013209cdf393b3d958ddd46ed50394349378826':
  Handle large AVCC chunks