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

Change-Id: I9bf48d297e9cf79a50044223fa8bbe75e51acd44