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

Change-Id: Id88464da83c41a12f834867c104f99e82c7462a0