Merge "Track libcore commit da61c6a1478cd1a14f3e654460292228f4f15e88"