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