Merge "Fix race between System.out.println & System.err.println in 087-gc-after-link" am: 130de851ab am: 8e8b12335d
am: d11f87d81b

Change-Id: Ia640f17101f2c1ec9f2df7fe90c889db2dd02c2c