Merge "Enable cfi xaac libraries"