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

Change-Id: I2a3c34bc91e37a2285a7a2b311243173b147faa8