Fix misnomer and resulting bug in keystore.cpp
am: 36e70f0782  -s ours

Change-Id: I618e3366c99387429fc3ca095b7f77c52035cb07