[automerger skipped] Merge "Fix AnimatedImageDrawables using ByteBuffers" into qt-qpr1-dev am: c024a1641f
am: 9b7af266c2 -s ours
am skip reason: change_id I51b69b5b70f8c5865d5e5ed065e42267fa556202 with SHA1 a7ec12f7ef is in history

Change-Id: Iccdce284c0576a0e4fd529d9bed92d579f05ea29