Merge "Allow the support library to add its own droiddoc options"