Merge "Remove @SystemApi from some constants for R."