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

Change-Id: I5631000351237a7f4bf3d6ef232a9521531b51f6