Simplify AES usage

This patch removes the custom AES wrappers.  They weren't doing anything
except increasing the number of allocations.  We now perform the AES
encrypt/decrypt inline in the two places we need it.