Merge "Use source for keystore/keymint interfaces." into sc-dev