Merge "Use device SKU for Build.SKU instead of product/odm SKU"