Merge "Track libcore change ee24b6322448ac919231a668e308ebd719aa52d7"