Merge "Revert "Revert "tools: Read ANDROID_COMPILE_WITH_JACK from build"""
am: 52a3c989f9

Change-Id: If6f99928d9f01450a053d4237456dc8c82bba9ac