Merge "Delete VNDK definition tools"