am d5cfec8d: am 7b8523aa: Merge "Remove all Dalvik allocations from Cavnas.drawBitmap(int[], ...)" into jb-dev

* commit 'd5cfec8d34a59f2a4e98b655b5e49775d69ad64c':
  Remove all Dalvik allocations from Cavnas.drawBitmap(int[], ...)