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

Change-Id: Icd3843c83384df5afdbd542fd4f676e46247dbac