Merge "Delete jack support"
am: 1704df64ce  -s ours

Change-Id: I185bb57219e86d9ef41ebcf5e3f03daaf4946529