Merge "Revert "tools: Read ANDROID_COMPILE_WITH_JACK from build""
am: 73264cc191

Change-Id: I3b900c2ed34f28acb918a89dfcc2be7d0a6cacfd