Merge "Fix handling of LOCAL_JACK_ENABLED"