Merge "Track libcore change dd5097d93d2f2c211fc79cde4d5f09db48e8808a"