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

Change-Id: I2ef38baafee936395c9177f9f11f8361ff61c8ba