clean vendorsetup

Change-Id: Icd794cd35464500d5b3531a93a5b6f0ba0902da7
Improve recovery compatability (vendor part)

Change-Id: I95cbe5ca11aae4bbbdf60090c0d601568e6fa86e