The macavf code doesn't compile as 32-bit, sigh

Change-Id: I51336c09aaa6ecdaa5da537a4a21efbff305da6e