Merge "Simplify handling of ANDROID_JACK_* variables"