Merge "Adjust for small changes in the native keystore interface"