Merge "Add 2 CF products to make x86 and x86_64 GSIs"