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

Change-Id: Ifce8d7b35ddee5398aecb4bdca4d7579cad18f1a