Android S V2 Preview 1
Merge "Specify KeyMint EC keys by curve not size"