Merge "Update expectations for libcore bug."