Merge "Add FINAL and OVERRIDE to calling conventions of the JNI compiler"