Track libcore change (cherry picked from commit 5bad107355d440409eea313b60c40bc32c12e295)

Bug: 27692239
Change-Id: I317bed961b861b8d1e0f8b17fc1ce2fa043baea9
3 files changed