Merge "Remove AndroidKeyStoreFactory now as it's not used anymore"