Merge "Consistent PRODUCT_MODEL name for x86(_64) GSI"