Merge "Put product_id and product_version to OEM partition."
am: dbcd26053b

Change-Id: If665126b6b7ddc6cb32b1fb3b375d68dc1bd1684