Merge "Track libcore change c49fd8d2b8449193fbb53750e7f6a22cacc2f968"