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

Change-Id: Icaa46801c51a6fba47d73d5d440f383c9e91becf