Merge "LegacyCamera: fix wrong class name in JNI" into oc-mr1-dev