Merge "docs: Removed reference to Android Support Library" into nyc-docs