Merge branch 'stable-3.9' * stable-3.9: Add support for newer plugin-node-resolve versions Change-Id: I203162ccb9013b401ea9ab6b8086e266a52725b5