Merge "Don't add Jack dependencies when building without Jack" am: 26c25d5da3 am: 04fc51c2a6
am: c2c033a774

Change-Id: I83904aeb523461c92acc382a14f788320c3d39a1