Merge "Fix cryptfs RSA signing with keystore2"