Merge "Add GYP as a target type that requires 2nd arch."