layoutlib 14 redeclares org.jetbrains.annotations.NotNull

[eygraber]

Description
DAGP warns when there are duplicate classes on your classpath.

I started getting warnings that look like:

Warnings
Some of your classpaths have duplicate classes, which means the compile and runtime behavior can be sensitive to the classpath order.

Source set: devDebug
\--- compile classpath
     \--- org/jetbrains/annotations/NotNull is provided by multiple dependencies: [com.android.tools.layoutlib:layoutlib:14.0.11, org.jetbrains:annotations:23.0.0]
\--- runtime classpath
     \--- org/jetbrains/annotations/NotNull is provided by multiple dependencies: [com.android.tools.layoutlib:layoutlib:14.0.11, org.jetbrains:annotations:23.0.0]

This happens with Paparazzi 1.3.5, which uses that version of layoutlib. Using Paparazzi 2.0.0-SNAPSHOT resolves the issue (presumably the issue was resolved in layoutlib 15).

Is there any way to backport something to 1.3.X that will fix this?