Merge "Fix AnimatedImageDrawables using ByteBuffers"