Track libcore change 5458546631c65f6d375b6a1780d36d0abb5b95af

Bug: 28108421
Change-Id: Id0253fed98790f4c8eeb27877e14cf53474f29f0
(cherry picked from commit 418d3817a001e95fe90ece038d1733ed7c034ede)
(cherry picked from commit 88e9407fc4ae760462b02e6a93070346afb747c9)
3 files changed