Merge "Fix standalone support library docs build" into nyc-mr1-dev