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

Change-Id: Ia90de5307777563665306dd10736d5790c00cbc7