Merge "Make test for hardware AES support explicit."