Merge "Make AAC 5.1 work Fix bug with pausing audio"