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

Change-Id: Ic4f241db75adcd7daca6b8ca749c721b0248d73d