Merge "Add vintf_fragments to keymaster@4.1-service" am: 96d959486c

Change-Id: Ibd406ddec83351b40f202b6c29e6be732967ad68