Merge "Rename PrivateApi annotation to SystemApi."