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

Change-Id: I93adef9a377347db22e271ec0fbbe3b6b34f2182