Merge "Rebuild the vendor install-recovery if necessary."
am: b4484dc33b

Change-Id: I2d8b60d925707b9008601bcf6cdaf70fadc627bb