Merge "Remove obsolete LOCAL_JACK_ENABLED"
am: 91952f32ff

Change-Id: I80e6a0fd58a6c55aa44f2256d40d4d979ae469f0