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

* commit '9ecada44042c49516d781281bbe0cba4e0af51a2':
  mNativeCanvas is long, not int.