Merge "CDD: correct file type for USAC"
am: a56b4c7fb4

Change-Id: I8209f7447be0994a9758efc98437dde362ce104d