Merge "Upgrade to the latest shadow gradle plugin"