Android keystore revised