Merge "Add AAC extractor"