Merge "Update api to reflect changes in doclava"