Merge "Merge "Add documents-archive to list of support libraries" into nyc-dev am: 1a44969bce am: dccbe07343" into nyc-mr1-dev-plus-aosp