am 59d0c658: am c783b9bd: Merge "Add GYP as a target type that requires 2nd arch."

* commit '59d0c658847d3c8118de46d2d7fa1fa3bfc563d2':
  Add GYP as a target type that requires 2nd arch.