Merge "Add VNDK definition tool."