Fix misnomer and resulting bug in keystore.cpp am: 00f94598c7  -s ours
am: 5dc6cf79c8  -s ours

Change-Id: I69467156d5e935e83fe3fdb9e5c791138b0c85fc