am ff70ea07: am 47751fe1: Revert "Separate Canvas JNI code from the implementation."

* commit 'ff70ea07c2e167a0b66624f7b69068c826c74008':
  Revert "Separate Canvas JNI code from the implementation."