Merge "camera: allow GPU usage for isSurfaceForHwVideoEncoder"