MFC r257847, r260243: Update aacraid to version 3.2.5.

Approved by:	emaste (co-mentor)