Merge "Don't add Jack dependencies when building without Jack" am: 26c25d5d am: 04fc51c2 am: c2c033a7 am: fb8c3898 Change-Id: Ie10d3801013be6f98fb90ffbb35df3151ea81c84