Merge "Avoid unnecessary copy when invoking drawBitmap(int[]) Bug #6483390" into jb-dev