Merge "Update api files from change in doclava stubs generator"