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

* commit 'bbceb2939f6b30d0954b09f63c987ee116bc1ad7':

Change-Id: Ie0e743141df762e552bd048b4ed8abb5abf49e70