Merge "Fix AnimatedImageDrawables using ByteBuffers" into qt-qpr1-dev
am: c024a1641f

Change-Id: I8fe79fe3cab8ba9dfe8938816b699d670be929f2