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

Change-Id: Ic102ba42d1eb83672b37f6089bf026cf80e8fa6a