Merge "Track change to private libcore data structure."