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

Change-Id: I15f97beb4deef072c869271b7b47449311a32b7a