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

Change-Id: I4c01fe0a6a5abf8c27964a6e5b248584e4adb838