Merge "Revert "tools: Read ANDROID_COMPILE_WITH_JACK from build""