Merge "Mount /vendor and /odm early"