Merge "Clear LOCAL_JACK_ENABLED for ANDROID_COMPILE_WITH_JACK=false"
am: 4b7074e249

Change-Id: I98927879453092b5d38b96c6fd2031e4d025aa80