Merge "Add bitsliced AES for ARMv7"