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

Change-Id: I490bbe861169c28c6022f7214c3e9b9e12b00b4b