Merge "Remove unused code in Keystore2's vintf library"