Merge "Revert "add support for rendering lottie animations through a LottieDrawable""