Merge "Allow split system/vendor image configuration"