Fix android_keymaster_test crashes. am: 9dd98de1d2  -s ours am: 47a2501f57  -s ours am: 1b6278cc98  -s ours
am: 5dc7cab437  -s ours

Change-Id: I20810878d5447e937f989184ef3f9c0b1990b151