Merge "Add vendor_dlkm partition (2nd attempt)" into sc-dev