Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"
am: 4ee94a6a9b

Change-Id: I93e4dc42695a35934748e4242bb36e4260cbd3ca