Merge "Handling of ANDROID_JACK_* variables is not needed"