Merge "Bug 5156756 Fix AAC ADTS header size computation"