Merge "Enable cfi for aac"