Handle software keymaster implementations. am: 1404b6e8b0
am: 66efa86145

Change-Id: I2ea4079310a4c826314fe62c0e912f3778b6dfea