Merge "Create gsi_x86 and gsi_x86_64 products"