Merge "Use source for keystore/keymint interfaces."