changes branch of vendor_rootbox to same as upstream

Change-Id: I94a9522bfe25a77dda8441b0ce5cb5f7ead424e3