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

Change-Id: I02d672b7962ac4eb80adcedc1452e855c7f10fcd