Merge "Revert^2 "Add dependency on keymint cpp lib""