Merge "Enable DISALLOW_DUPLICATE_FIELD_IN_SKELETON since U"