am 04d2804a: am 13cfe85a: Merge "reuse CCDecoder on video discontinuity" into lmp-mr1-dev

* commit '04d2804a212c2625425cb23b2b778ab4f3683769':
  reuse CCDecoder on video discontinuity