Revert "ARM: move AES typedefs and function prototypes to separate header"

This reverts commit df1908afb23063b994c51744b8d5113c84b10268.