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

Change-Id: Iaf8f218a46ff225ebb9b4c9303e9d23dee786a9c