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

Change-Id: I75dbb01cd7fb73581faa0ca5bbb6392387ed06b5