Merge "Remove obsolete LOCAL_JACK_ENABLED" am: 91952f32ff am: 7c40c6d18e
am: ced47b2882

Change-Id: I33c0c30ea22863656ee33fbfcbf6da5096b9827a