Track libcore change c5c1e2717349a96913dc88722a20c7c1ec2cae68

Bug: 28058863
Change-Id: Id4bfeaf0f85d63b658dee3b74f91d7468c8eab95
(cherry picked from commit b443d5d171fdbe00bf9806645776c8da3f6b85ba)
(cherry picked from commit 0201c5566dd09a19a05b04ba5b803f60b4111b76)
3 files changed