Merge "SnapdragonCamera: Enable build of local jni libraries"