Merge "Update expectations for libcore/gcstress." am: 72fb8639a6
am: 074fe2e12b

Change-Id: Iede8a0d52c5036769971b8e00d3dba9ee9eac15f