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

Change-Id: I9e4fca9d71cbf372bf9a8177cbfc5ad6b31338aa