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

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

xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build,xorware/android_build