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

"GYP" class targets are used by external/chromium_org for gyp's "none"
type. The processing in these targets needs a separate intermediate
directory for the primary/secondary architecture, so add it to the list
in intermediates-dir-for along with libraries/executables.

Change-Id: Id05899c83b45ed0647dfbfa6b0b2e7f61b04348b
aosp_arm64: increase userdata image size

Increase userdata image size to allow make tests to builds with
extra tests to fit.

Change-Id: I2fea99d5a39816e78595215481b60ee51eb9182f
Merge "Add GYP as a target type that requires 2nd arch."
Merge "aosp_arm64: increase userdata image size"
auto-merger: merge in from aosp/master