Merge "On-device signing: switch to using Keystore2."