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

Change-Id: Ie10d3801013be6f98fb90ffbb35df3151ea81c84