am dfd4f523: am d228a038: Merge "mNativeCanvas is long, not int."

* commit 'dfd4f5232c87c51fe639b594fd210b4073eca42b':
  mNativeCanvas is long, not int.