Merge "Fix StatsLog JNI registration"