am 57a1f3e9: am 526b2285: Merge "In certain cases where AAC audio frames extended into the next PES payload" into jb-mr2-dev

* commit '57a1f3e9ee9cca3c72f5d1cfd9c988784122d777':
  In certain cases where AAC audio frames extended into the next PES payload