Merge "SnapdragonCamera: Fix compile error on Android M" into camera.lnx.1.0-dev.1.0