Merge "Implement a back-level KeyMint compatibility wrapper"