am c5d0fac0: Merge "Bug 5156756 Fix AAC ADTS header size computation"

* commit 'c5d0fac081c4c496b29586bff79dfff05755b716':
  Bug 5156756 Fix AAC ADTS header size computation