Merge "Track a typo fix in hidden libcore API."