Merge "Allow product partition to have vendor_overlay" am: 69f174a488
am: c0f74d8dfe

Change-Id: I1e6c658560e7005cdd7f94723eb5c00869a08da7