Merge "/odm is another vendor partition other than /vendor" into pi-dev