Merge "Separate Canvas JNI code from the implementation." into lmp-dev