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