Merge "Track libcore change fe6fe17d1ca75ee039df7ab93314f3f1e068794f."