Merge "Make test for hardware AES support explicit." am: df3055d2ec

Change-Id: I7c117d6454af4abcad4ceb1f73d7a4e26d5b003f