Merge "Add vintf_fragments to keymaster@4.1-service"