Merge "Support product partition for non-treblized devices"
am: 79bd67bb2f

Change-Id: Idec25d0e1370bb93c5fa6ea9a12a6164e2fba297