Merge "Adapt to change of LOCAL_USE_JACK values"