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

* commit '1a6e29aae589073bfd6bd5f42816e622584cfb7a':
  mNativeCanvas is long, not int.