Merge "Track libcore change 547177ca5c312f84fb22e6e7bf12f54129034e5d"