Merge "Track libcore change e2f147b9b14c7645f29e92758f811a18258feef4"