Merge "SnapdragonCamera: Fix jni library names"