Track libcore change 2115cc0ca7d60965a361129d8826478ff2d847e4

Bug: 28108421
Change-Id: I774f264bf538b0fa2aac63c8e5225f82d7b03c2e
(cherry picked from commit 5182e272ad7b14604dc4d90114d97cf238140178)
(cherry picked from commit 05a77eee41804fc135cd43a7dfb8125c3365b0e2)
3 files changed