Merge "Changing default Jack arguments." am: cadf11068c
am: 8488228d9a

Change-Id: I3f1ce5f5c0d24afb890b7b2b08d89091f1b24feb