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

Change-Id: Iaa7c0e803018db5006df614640283d444416393c