Merge "Repackage vcn utils in frameworks-minus-apex"